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

fix:工单仓库类型改为string

Browse Source
This commit is contained in:
zhaoyf
2026-07-17 19:17:16 +08:00
parent 844a2d2514
commit 42534bd22e
5 changed files with 6 additions and 8 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

@@ -74,7 +74,7 @@ public class MesToWmsController {
@SaIgnore @SaIgnore
@Log("工单同步") @Log("工单同步")
public ResponseEntity subWorkOrder(@RequestBody List<WorkOrderDto.WorkOrderDataDto> dtos){ public ResponseEntity subWorkOrder(@RequestBody List<WorkOrderDto.WorkOrderDataDto> dtos){
String[] filter = {"E301050","E301100"};//过滤产线 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);

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

@@ -207,7 +207,7 @@ public class LineCallFullTask extends AbstractTask {
entry.setUnitno(orderBomItem.getUnit()); entry.setUnitno(orderBomItem.getUnit());
entry.setQty(plate.getQty()); entry.setQty(plate.getQty());
entry.setBaseqty(orderBomItem.getBom_qty()); entry.setBaseqty(orderBomItem.getBom_qty());
entry.setWarehouseno(orderBomItem.getWarehouse_code().stripTrailingZeros().toPlainString()); entry.setWarehouseno(orderBomItem.getWarehouse_code());
entry.setSrcbillno(workOrder.getOrder_code()); entry.setSrcbillno(workOrder.getOrder_code());
entry.setSrcbillid(workOrder.getOrder_id()); entry.setSrcbillid(workOrder.getOrder_id());
entry.setSrcbillentryid(orderBomItem.getItem_id()); entry.setSrcbillentryid(orderBomItem.getItem_id());

2
nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderBomDao.java
View File

@@ -39,7 +39,7 @@ public class WorkOrderBomDao {
private String sup_org_code; private String sup_org_code;
private BigDecimal warehouse_code; private String warehouse_code;
private String warehouse_name; private String warehouse_name;

4
nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dao/WorkOrderDao.java
View File

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
@Data @Data
@EqualsAndHashCode(callSuper = false) @EqualsAndHashCode(callSuper = false)
@TableName("md_work_order") @TableName("md_work_order")
@@ -37,7 +35,7 @@ public class WorkOrderDao {
private String plan_finished_on; private String plan_finished_on;
private BigDecimal default_warehouse_code; private String default_warehouse_code;
private String default_warehouse_name; private String default_warehouse_name;

4
nladmin-system/wms-server/src/main/java/org/nl/wms/welding_manage/service/work_order/dto/WorkOrderDto.java
View File

@@ -73,7 +73,7 @@ public class WorkOrderDto implements Serializable {
private String planFinishedOn; private String planFinishedOn;
@JsonProperty("DefaultWarehouseCode") @JsonProperty("DefaultWarehouseCode")
private BigDecimal defaultWarehouseCode; private String defaultWarehouseCode;
@JsonProperty("DefaultWarehouseName") @JsonProperty("DefaultWarehouseName")
private String defaultWarehouseName; private String defaultWarehouseName;
@@ -259,7 +259,7 @@ public class WorkOrderDto implements Serializable {
private String supOrgCode; private String supOrgCode;
@JsonProperty("WarehouseCode") @JsonProperty("WarehouseCode")
private BigDecimal warehouseCode; private String warehouseCode;
@JsonProperty("WarehouseName") @JsonProperty("WarehouseName")
private String warehouseName; private String warehouseName;