root/wq-wms-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix:涂装产线测试问题修复

Browse Source
This commit is contained in:
zhaoyf
2026-07-20 15:37:57 +08:00
parent 1cb246ca92
commit a1bd196ad7
5 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nladmin-system/wms-server/src/main/java/org/nl/wms/ext_manage/controller/MesToWmsController.java
View File

@@ -77,7 +77,7 @@ public class MesToWmsController {
public ResponseEntity subWorkOrder(@RequestBody List<WorkOrderDto.WorkOrderDataDto> dtos){ public ResponseEntity subWorkOrder(@RequestBody List<WorkOrderDto.WorkOrderDataDto> dtos){
String[] filter = {};//过滤产线 String[] filter = {};//过滤产线
for (WorkOrderDto.WorkOrderDataDto dto : dtos) { for (WorkOrderDto.WorkOrderDataDto dto : dtos) {
if (ArrayUtils.contains(filter, dto.getWorkArea())){ if (!ArrayUtils.contains(filter, dto.getWorkArea())){
iWorkOrderService.insert(dto); iWorkOrderService.insert(dto);
} }
} }

1
nladmin-system/wms-server/src/main/java/org/nl/wms/pda_manage/ios_manage/purchase/service/impl/InboundPdaServiceImpl.java
View File

@@ -276,7 +276,6 @@ public class InboundPdaServiceImpl implements InboundPdaService {
addParam.setStorCode(structattr.getStor_code()); addParam.setStorCode(structattr.getStor_code());
addParam.setQty(item.getQty()); addParam.setQty(item.getQty());
addInvParams.add(addParam); addInvParams.add(addParam);
continue;
} }
} }
MdMeMaterialbase materDao = iMdMeMaterialbaseService.getByCode(item.getSku_code()); MdMeMaterialbase materDao = iMdMeMaterialbaseService.getByCode(item.getSku_code());

5
nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/StructAreaDeliveryAutoTask.java
View File

@@ -48,10 +48,7 @@ public class StructAreaDeliveryAutoTask {
return; return;
} }
//查看所有可用点位 按区域区分 //查看所有可用点位 按区域区分
Map<String, List<String>> empRegionPointMap = iSchBasePointService.selectIdlePoint(Arrays.asList(RegionConstant.SPRAYING_RAW_MATERIAL_SIDE Map<String, List<String>> empRegionPointMap = iSchBasePointService.list().stream()
, RegionConstant.WELDING_RAW_MATERIAL_SIDE
, RegionConstant.MACHINE_RAW_MATERIAL_SIDE
, RegionConstant.MACHINE_RAW_MATERIAL_SIDE)).stream()
.collect(Collectors.groupingBy( .collect(Collectors.groupingBy(
SchBasePoint::getRegion_code, SchBasePoint::getRegion_code,
Collectors.mapping(SchBasePoint::getPoint_code, Collectors.toList()) Collectors.mapping(SchBasePoint::getPoint_code, Collectors.toList())

4
nladmin-system/wms-server/src/main/java/org/nl/wms/sch_manage/service/core/tasks/Point2PointTask.java
View File

@@ -202,8 +202,8 @@ public class Point2PointTask extends AbstractTask {
entry.put("qty", plate.getQty()); entry.put("qty", plate.getQty());
entry.put("materialNo", orderBomItem.getMaterial_code()); entry.put("materialNo", orderBomItem.getMaterial_code());
entry.put("unitNo", "PCS"); entry.put("unitNo", "PCS");
entry.put("receiptWarehouseNo", orderBomItem.getWarehouse_code()); entry.put("receiptWarehouseNo", workOrder.getDefault_warehouse_code());
entry.put("issueWarehouseNo", workOrder.getDefault_warehouse_code()); entry.put("issueWarehouseNo", orderBomItem.getWarehouse_code());
// 将entry添加到数组中 // 将entry添加到数组中
entrys.add(entry); entrys.add(entry);
} }

2
nladmin-ui/src/views/wms/st/inAndOutReturn/index.vue
View File

@@ -302,7 +302,7 @@ export default {
'0009': '手工入库', '0009': '手工入库',
'1001': '销售出库', '1001': '销售出库',
'0006': '生产领料', '0006': '生产领料',
'0007': '库存调拨', '2001': '库存调拨',
'106': '调拨出库', '106': '调拨出库',
'107': '调拨入库', '107': '调拨入库',
'109': '其他入库', '109': '其他入库',