rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch '惠信/dev_zhangke' into rakor

This commit is contained in:
曹鹏飞 2025-09-26 12:01:19 +08:00
parent 44d06ad46d e2b5bb6778
commit 5d8f839272
5 changed files with 55 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
nflg-wms-admin/src/main/java/com/nflg/wms/admin/service/MaterialControllerService.java
View File

@ -158,7 +158,8 @@ public class MaterialControllerService {
pics.add(name); pics.add(name);
} else { } else {
WmsMaterial wmsMaterial = materialService.getCurrent(materialNo); WmsMaterial wmsMaterial = materialService.getCurrent(materialNo);
if (Objects.isNull(wmsMaterial) || !(StrUtil.isNotBlank(wmsMaterial.getImage()) && Objects.nonNull(wmsMaterial.getWeight()))){ if (Objects.isNull(wmsMaterial) || StrUtil.isNotBlank(wmsMaterial.getImage()))
{
wmsMaterial = new WmsMaterial() wmsMaterial = new WmsMaterial()
.setId(null) .setId(null)
.setVersion(Objects.isNull(wmsMaterial) ? 1 : wmsMaterial.getVersion() + 1) .setVersion(Objects.isNull(wmsMaterial) ? 1 : wmsMaterial.getVersion() + 1)

2
nflg-wms-admin/src/test/java/com/nflg/wms/admin/DeployTest.java
View File

@ -38,7 +38,7 @@ public class DeployTest {
//处理字体目录 //处理字体目录
handleDir(sshUtil, localPath, remotePath, "fonts"); handleDir(sshUtil, localPath, remotePath, "fonts");
//处理lib目录 //处理lib目录
// handleDir(sshUtil, localPath, remotePath, "lib"); handleDir(sshUtil, localPath, remotePath, "lib");
//执行脚本启动服务 //执行脚本启动服务
sshUtil.exec("cd " + remotePath + " && ./restart.sh"); sshUtil.exec("cd " + remotePath + " && ./restart.sh");
sshUtil.disconnect(); sshUtil.disconnect();

7
nflg-wms-repository/src/main/resources/mapper/WmsPoReceiptItemMapper.xml
View File

@ -7,7 +7,12 @@
from wms_po_receipt from wms_po_receipt
where is_completed=false and source_type=0 where is_completed=false and source_type=0
<if test="orederNo !=null and orederNo !='' "> <if test="orederNo !=null and orederNo !='' ">
and ( order_no ilike #{orederNo} or in_num ilike #{orederNo} ) and (
order_no like concat('%', #{orederNo}, '%')
or in_num like concat('%', #{orederNo}, '%')
or exists (select 1 from wms_po_receipt_item where wms_po_receipt.id=wms_po_receipt_item.receive_id
and wms_po_receipt_item.po_num like concat('%', #{orederNo}, '%'))
)
</if> </if>
order by id desc order by id desc
</select> </select>

7
nflg-wms-repository/src/main/resources/mapper/WmsQcReceiveMapper.xml
View File

@ -11,7 +11,12 @@
from wms_qc_receive from wms_qc_receive
where is_completed !=2 and is_check = true and source_type=0 where is_completed !=2 and is_check = true and source_type=0
<if test="orderNo != null and orderNo != ''"> <if test="orderNo != null and orderNo != ''">
and ( in_no ilike concat( '%',#{orderNo},'%') or order_no ilike concat( '%',#{orderNo},'%') ) and ( in_no like concat( '%',#{orderNo},'%')
or order_no like concat( '%',#{orderNo},'%')
or exists (select 1 from wms_qc_receive_item where wms_qc_receive.id=wms_qc_receive_item.receive_id
and wms_qc_receive_item.po_num
ilike concat('%', #{orderNo}, '%'))
)
</if> </if>
order by create_time desc order by create_time desc
</select> </select>

2
nflg-wms-scheduled/src/main/java/com/nflg/wms/scheduled/processor/MaterialZipImportProcessor.java
View File

@ -69,7 +69,7 @@ public class MaterialZipImportProcessor implements BasicProcessor {
omsLogger.error("主数据中未查找到该物料:{}", materialNo); omsLogger.error("主数据中未查找到该物料:{}", materialNo);
} else { } else {
WmsMaterial wmsMaterial = materialService.getCurrent(materialNo); WmsMaterial wmsMaterial = materialService.getCurrent(materialNo);
if (Objects.isNull(wmsMaterial) || !(StrUtil.isNotBlank(wmsMaterial.getImage()) && Objects.nonNull(wmsMaterial.getWeight()))) { if (Objects.isNull(wmsMaterial) || StrUtil.isNotBlank(wmsMaterial.getImage())) {
omsLogger.info("添加图纸"); omsLogger.info("添加图纸");
wmsMaterial = new WmsMaterial() wmsMaterial = new WmsMaterial()
.setId(null) .setId(null)