diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/PurchaseOrderController.java b/src/main/java/com/xujie/sys/modules/pms/controller/PurchaseOrderController.java index f12fc99a..aee56425 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/PurchaseOrderController.java +++ b/src/main/java/com/xujie/sys/modules/pms/controller/PurchaseOrderController.java @@ -83,6 +83,7 @@ public class PurchaseOrderController { purchaseOrderHead.setCreateTime(new Date()); purchaseOrderHead.setBuDesc(purchaseOrders.get(0).getBuDesc()); purchaseOrderHead.setPurchaseOrderNo(purchaseOrderNo); + purchaseOrderHead.setStatus("未入库"); purchaseOrderHeadMapper.insertPurchaseOrderHead(purchaseOrderHead); //拿到新建表头后返回的ID Long purchaseOrderHeadId = purchaseOrderHead.getId(); diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrderHead.java b/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrderHead.java index 20e15adc..fa038a5c 100644 --- a/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrderHead.java +++ b/src/main/java/com/xujie/sys/modules/pms/entity/PurchaseOrderHead.java @@ -43,4 +43,5 @@ public class PurchaseOrderHead { private Integer no; private Integer size; + private String status; } diff --git a/src/main/resources/mapper/pms/PurchaseOrderHeadMapper.xml b/src/main/resources/mapper/pms/PurchaseOrderHeadMapper.xml index 596061e5..d90c80f5 100644 --- a/src/main/resources/mapper/pms/PurchaseOrderHeadMapper.xml +++ b/src/main/resources/mapper/pms/PurchaseOrderHeadMapper.xml @@ -6,9 +6,9 @@ insert into purchase_order_head - (isExport,purchaseOrderNo,buDesc,createBy,createTime) + (isExport,purchaseOrderNo,buDesc,createBy,createTime,status) values - (#{isExport},#{purchaseOrderNo},#{buDesc},#{createBy},#{createTime}) + (#{isExport},#{purchaseOrderNo},#{buDesc},#{createBy},#{createTime},#{status}) update purchase_order_head set isExport=#{isExport} ,exportBy=#{exportBy}, diff --git a/src/main/resources/mapper/pms/PurchaseOrderMapper.xml b/src/main/resources/mapper/pms/PurchaseOrderMapper.xml index a6075c66..eddfdd1f 100644 --- a/src/main/resources/mapper/pms/PurchaseOrderMapper.xml +++ b/src/main/resources/mapper/pms/PurchaseOrderMapper.xml @@ -86,6 +86,9 @@ and poh.exportTime #{params.endDate} + + and poh.status = #{params.status} + order by poh.id desc