采购单查询条件修改

选择供应商接口修改
选择人员接口修改

src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillQuery.java

@@ -49,7 +49,7 @@ public class PurchaseBillQuery implements Query {
     @ApiModelProperty("单据编号")
     private String billNo;
     @ApiModelProperty("采购员")
-    private String purchaserSid;
+    private String purchaserName;
     @ApiModelProperty("备注")
     private String remarks;
     @ApiModelProperty("发货状态key")

src/main/java/com/yxt/purchase/biz/purchasebill/PurchaseBillService.java

@@ -110,19 +110,19 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
             qw.eq("pb.wareHouseSid", query.getWareHouseSid());
         }
         if (StringUtils.isNotBlank(query.getReceiveStateKey())) {
-            qw.eq("pbe.receiveStateValue", query.getReceiveStateKey());
+            qw.eq("pbe.receiveStateKey", query.getReceiveStateKey());
         }
         if (StringUtils.isNotBlank(query.getLogisticsNum())) {
             qw.like("pbe.logisticsNum", query.getLogisticsNum());
         }
         if (StringUtils.isNotBlank(query.getDeliveryStateKey())) {
-            qw.eq("pbe.deliveryStateValue", query.getDeliveryStateKey());
+            qw.eq("pbe.deliveryStateKey", query.getDeliveryStateKey());
         }
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("pb.billNo", query.getBillNo());
         }
-        if (StringUtils.isNotBlank(query.getPurchaserSid())) {
-            qw.like("pb.purchaserSid", query.getPurchaserSid());
+        if (StringUtils.isNotBlank(query.getPurchaserName())) {
+            qw.like("pb.purchaserName", query.getPurchaserName());
         }
         if (StringUtils.isNotBlank(query.getRemarks())) {
             qw.like("pb.remarks", query.getRemarks());
@@ -179,19 +179,19 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
             qw.eq("pb.wareHouseSid", query.getWareHouseSid());
         }
         if (StringUtils.isNotBlank(query.getReceiveStateKey())) {
-            qw.eq("pbe.receiveStateValue", query.getReceiveStateKey());
+            qw.eq("pbe.receiveStateKey", query.getReceiveStateKey());
         }
         if (StringUtils.isNotBlank(query.getLogisticsNum())) {
             qw.like("pbe.logisticsNum", query.getLogisticsNum());
         }
         if (StringUtils.isNotBlank(query.getDeliveryStateKey())) {
-            qw.eq("pbe.deliveryStateValue", query.getDeliveryStateKey());
+            qw.eq("pbe.deliveryStateKey", query.getDeliveryStateKey());
         }
         if (StringUtils.isNotBlank(query.getBillNo())) {
             qw.like("pb.billNo", query.getBillNo());
         }
-        if (StringUtils.isNotBlank(query.getPurchaserSid())) {
-            qw.like("pb.purchaserSid", query.getPurchaserSid());
+        if (StringUtils.isNotBlank(query.getPurchaserName())) {
+            qw.like("pb.purchaserName", query.getPurchaserName());
         }
         if (StringUtils.isNotBlank(query.getRemarks())) {
             qw.like("pb.remarks", query.getRemarks());
@@ -236,7 +236,9 @@ public class PurchaseBillService extends MybatisBaseService<PurchaseBillMapper,
             purchaseBillAmountService.insertByDto(purchaseBillAmount);
             //保存采购单扩展
             purchaseBillExtend.setBillSid(sid);
+            purchaseBillExtend.setDeliveryStateKey("1");
             purchaseBillExtend.setDeliveryStateValue("未发货");
+            purchaseBillExtend.setReceiveStateKey("1");
             purchaseBillExtend.setReceiveStateValue("待提交");
             purchaseBillExtendService.insertByDto(purchaseBillExtend);
             //保存商品信息