diff --git a/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java b/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java index 1b5eedf..8a3e501 100644 --- a/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java +++ b/src/main/java/com/srq/modules/orderIssure/entity/IssureNotifyEntity.java @@ -104,9 +104,6 @@ public class IssureNotifyEntity extends QueryPage implements Serializable{ @TableField(exist = false) private String locationNo; - @TableField(exist = false) - private String assignedQty; - // 库存数量_仓库库位 @TableField(exist = false) private String onhandQty; @@ -118,7 +115,7 @@ public class IssureNotifyEntity extends QueryPage implements Serializable{ @TableField(exist = false) private String fgPartDesc; - // 下发数量_实时 已领数量 + // 已领数量 @TableField(exist = false) private String issueQty; @@ -142,6 +139,26 @@ public class IssureNotifyEntity extends QueryPage implements Serializable{ @TableField(exist = false) private String origAssignedQty; + @TableField(exist = false) + private String assignedQty;// 领料数量 + + @TableField(exist = false) + private String currentIssuedQty;//下发数量-实时 + @TableField(exist = false) + private String productCategory;//产品大类 + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") + @TableField(exist = false) + private Date cNeedDate;//领料单需求日期 + @TableField(exist = false) + private String currIssueQty;//提货单下发数量 + @TableField(exist = false) + private String unissueQty;//当前提货单退料数量 + @TableField(exist = false) + private String tranId;//事务标识 + @TableField(exist = false) + private String opStartDate;// 工序开始时间 // Getter 和 Setter 方法 diff --git a/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java b/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java index ea9dfba..40be6ed 100644 --- a/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java +++ b/src/main/java/com/srq/modules/orderIssure/service/impl/IssureNotifyServiceImpl.java @@ -182,10 +182,10 @@ public class IssureNotifyServiceImpl implements IssureNotifyService { String billLadingDetailStr = String.valueOf(getBillLadingDetailResponse.getObj()); List issureNotifyList = JSON.parseArray(billLadingDetailStr, ProductionWarehousingEntity.class); - if (issureNotifyList == null || issureNotifyList.isEmpty()) { - throw new RuntimeException("获取IFS数据提货单明细失败:获取的数据为空!" + - getBillLadingDetailResponse.getMsg()); - } +// if (issureNotifyList == null || issureNotifyList.isEmpty()) { +// throw new RuntimeException("获取IFS数据提货单明细失败:获取的数据为空!" + +// getBillLadingDetailResponse.getMsg()); +// } return issureNotifyList; } diff --git a/src/main/java/com/srq/modules/productionWarehousing/service/impl/ProductionWarehousingServiceImpl.java b/src/main/java/com/srq/modules/productionWarehousing/service/impl/ProductionWarehousingServiceImpl.java index cf3e79a..f82c588 100644 --- a/src/main/java/com/srq/modules/productionWarehousing/service/impl/ProductionWarehousingServiceImpl.java +++ b/src/main/java/com/srq/modules/productionWarehousing/service/impl/ProductionWarehousingServiceImpl.java @@ -42,14 +42,14 @@ public class ProductionWarehousingServiceImpl implements ProductionWarehousingSe ResponseData getProductionWorkOrderResponse = HttpClientUtil.doPostByRawWithSRQ(getProductionWorkOrder, productionWarehousingEntity); if (!"200".equals(getProductionWorkOrderResponse.getCode())) { - throw new RuntimeException("获取IFS数据失败" + getProductionWorkOrderResponse.getMsg()); + throw new RuntimeException("获取IFS生产入库数据失败" + getProductionWorkOrderResponse.getMsg()); } String productionWorkOrderStr = String.valueOf(getProductionWorkOrderResponse.getObj()); List productionWarehousingList = JSON.parseArray(productionWorkOrderStr, ProductionWarehousingEntity.class); - if (productionWarehousingList == null || productionWarehousingList.isEmpty()) { - throw new RuntimeException("获取IFS数据失败" + getProductionWorkOrderResponse.getMsg()); - } +// if (productionWarehousingList == null || productionWarehousingList.isEmpty()) { +// throw new RuntimeException("获取IFS生产入库数据失败" + getProductionWorkOrderResponse.getMsg()); +// } return new PageUtils(productionWarehousingList, getProductionWorkOrderResponse.getCount(), data.getLimit(), data.getPage());