Merge remote-tracking branch 'origin/orderChange' into orderChange

# Conflicts:
#	api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java
#	api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java
#	api-admin/src/main/resources/application-pro.properties

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/StockOrderDetailController.java

@@ -333,6 +333,9 @@ public class StockOrderDetailController {
                 stockOrderDetailEntity.setRelId(udiInfoEntity.getRlId() + "");
                 stockOrderDetailEntity.setProductName(udiInfoEntity.getCpmctymc());
                 stockOrderDetailEntity.setSpec(udiInfoEntity.getGgxh());
+                if (stockSelectDataEntity.getCount() != null) {
+                    stockOrderDetailEntity.setCount(stockSelectDataEntity.getCount() + "");
+                } else
                     stockOrderDetailEntity.setCount(0 + "");
                 stockOrderDetailEntity.setReCount(0 + "");
                 stockOrderDetailEntity.setBatchNo(stockSelectDataEntity.getBatchNo());
@@ -341,8 +344,8 @@ public class StockOrderDetailController {
                 stockOrderDetailEntity.setManufactory(udiInfoEntity.getManufactory());
                 stockOrderDetailEntity.setYlqxzcrbarmc(udiInfoEntity.getYlqxzcrbarmc());
                 stockOrderDetailEntity.setSupName(udiInfoEntity.getCompanyName());
-                if (StrUtil.isNotEmpty(stockOrderIdsRequest.getZczbhhzbapzbh()))
+                if (StrUtil.isNotEmpty(stockSelectDataEntity.getZczbhhzbapzbh()))
-                    stockOrderDetailEntity.setZczbhhzbapzbh(stockOrderIdsRequest.getZczbhhzbapzbh());
+                    stockOrderDetailEntity.setZczbhhzbapzbh(stockSelectDataEntity.getZczbhhzbapzbh());
                 else
                     stockOrderDetailEntity.setZczbhhzbapzbh(udiInfoEntity.getZczbhhzbapzbh());
                 stockOrderDetailEntity.setAllowNoBatch(udiInfoEntity.isAllowNoBatch());
@@ -376,11 +379,13 @@ public class StockOrderDetailController {
         }
         //供应商选入时需要校验证书是否齐全
         if (stockOrderIdsRequest.getType() == 0) {
+
+            StockSelectDataEntity stockSelectDataEntity = stockOrderIdsRequest.getDatas().get(0);
             String value = systemParamConfigService.selectValueByParamKey("checkCert");
             if (StrUtil.isNotEmpty(value) && value.equals("1")) {
                 //判断证书是否齐全
-                if (StrUtil.isNotEmpty(stockOrderIdsRequest.getZczbhhzbapzbh())) {
+                if (StrUtil.isNotEmpty(stockSelectDataEntity.getZczbhhzbapzbh())) {
-                    SupProductResponse supProductResponse = supProductService.findByPassByReCert(stockOrderIdsRequest.getZczbhhzbapzbh());
+                    SupProductResponse supProductResponse = supProductService.findByPassByReCert(stockSelectDataEntity.getZczbhhzbapzbh());
                     if (supProductResponse == null) {
                         return ResultVOUtils.error(601, "该产品所对应的资质证书未通过审核,无法配送，请先维护产品资质信息");
                     }

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurApplyController.java

@@ -181,7 +181,9 @@ public class PurApplyController {
             purPlanEntity.setApplyAuditBy(purApplyEntity.getAuditBy());
             purPlanEntity.setRemark("申购科室：" + purApplyRequest.getSubInvName() +
                     ";申购人：" + purApplyRequest.getCreateByName() + ";申购原因：" + purApplyRequest.getRemark());
-
+            purApplyEntity.setPlanBillNo(purPlanEntity.getBillNo());
+            purApplyEntity.setGeneratePlan(true);
+            purApplyService.update(purApplyEntity);
             purPlanService.insert(purPlanEntity);
             List<PurApplyDetailEntity> purApplyDetailEntities = purApplyDetailService.findByOrderId(purApplyEntity.getId() + "");
             if (CollUtil.isNotEmpty(purApplyDetailEntities)) {

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/PurPlanController.java

@@ -10,6 +10,7 @@ import com.glxp.sale.admin.entity.basic.BasicBusTypeChangeEntity;
 import com.glxp.sale.admin.entity.basic.BasicUnitMaintainEntity;
 import com.glxp.sale.admin.entity.inout.StockOrderDetailEntity;
 import com.glxp.sale.admin.entity.inout.StockOrderEntity;
+import com.glxp.sale.admin.entity.purchase.PurApplyEntity;
 import com.glxp.sale.admin.entity.purchase.PurPlanDetailEntity;
 import com.glxp.sale.admin.entity.purchase.PurPlanEntity;
 import com.glxp.sale.admin.req.purchase.PostPurPlanRequest;
@@ -172,7 +173,6 @@ public class PurPlanController {
 
         List<PurPlanDetailEntity> purPlanDetailEntities = purPlanDetailService.findByOrderId(purApplyEntity.getId() + "");
 
-//        BasicBusTypeChangeEntity basicBusTypeChangeEntity = basicBusTypeChangeService.findByAction(purApplyEntity.getBillType());
         //转换成业务单据
         if (postPurPlanRequest.getEditStatus() == ConstantStatus.APPLY_AUDIT_ED
                 && StrUtil.isNotEmpty(purApplyEntity.getTargetSubInv()) && StrUtil.isNotEmpty(purApplyEntity.getTargetBillAction())) {
@@ -344,4 +344,12 @@ public class PurPlanController {
     }
 
 
+    //选入申购单
+    @PostMapping("/purchase/plan/selectApply")
+    public BaseResponse selectApply(@RequestBody PurApplyEntity purApplyEntity) {
+
+        return ResultVOUtils.success("新增成功！");
+    }
+
+
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/UdiInfoEntity.java

@@ -29,7 +29,7 @@ public class UdiInfoEntity {
     private String ylqxzcrbarywmc;
     private String sydycpbs;
     private String uuid;
-    private int versionNumber;
+    private Integer versionNumber;
     private Integer diType;
     private String thirdId;
     private String thirdName;
@@ -300,11 +300,11 @@ public class UdiInfoEntity {
         this.uuid = uuid;
     }
 
-    public int getVersionNumber() {
+    public Integer getVersionNumber() {
         return versionNumber;
     }
 
-    public void setVersionNumber(int versionNumber) {
+    public void setVersionNumber(Integer versionNumber) {
         this.versionNumber = versionNumber;
     }
 

api-admin/src/main/java/com/glxp/sale/admin/entity/purchase/PurApplyEntity.java

@@ -77,4 +77,5 @@ public class PurApplyEntity {
     private String targetBillType;
 
     private String planBillNo;      //生成采购计划单据号
+    private boolean generatePlan;       //是否已生成采购计划单
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderIdsRequest.java

@@ -15,7 +15,7 @@ public class StockOrderIdsRequest {
     boolean filterUDIType;
     UdiEntity udiEntity;
     List<StockOrderDetailEntity> stockOrderLists;
-    private String zczbhhzbapzbh;
+
     private int type;           //1：耗材领用
     private int purType;
 }

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockSelectDataEntity.java

@@ -9,4 +9,6 @@ public class StockSelectDataEntity {
     private String expireDate;
     private String productDate;
     private String supId;
+    private String zczbhhzbapzbh;
+    private Integer count;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/purchase/PurApplyResponse.java

@@ -75,8 +75,10 @@ public class PurApplyResponse {
     private String targetBillType;
 
     private String planBillNo;      //生成采购计划单据号
+    private boolean generatePlan;
+    private boolean audtoPlan;  ///
+
 
-    private boolean audtoPlan;
 
 
 }

api-admin/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -564,7 +564,6 @@
             <if test="price != null">price=#{price},</if>
             <if test="useNum != null">useNum=#{useNum},</if>
             <if test="useMuti != null">useMuti=#{useMuti}</if>
-
         </trim>
         WHERE id = #{id}
     </update>

api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDao.xml

@@ -60,7 +60,7 @@
         INTO  pur_apply
         (
         billNo,billDate,status,billType,remark,locStorageCode,invWarehouseCode,
-        deptCode,createBy,createTime,auditBy,auditTime,updateTime,auditRemark,targetInv,targetSubInv,targetBillType,planBillNo
+        deptCode,createBy,createTime,auditBy,auditTime,updateTime,auditRemark,targetInv,targetSubInv,targetBillType,planBillNo,generatePlan
         )
         values (
         #{billNo},
@@ -80,7 +80,8 @@
         #{targetInv},
         #{targetSubInv},
         #{targetBillType},
-        #{planBillNo}
+        #{planBillNo},
+        #{generatePlan}
         )
     </insert>
 
@@ -120,6 +121,7 @@
             <if test="targetSubInv != null">targetSubInv=#{targetSubInv},</if>
             <if test="targetBillType != null">targetBillType=#{targetBillType},</if>
             <if test="planBillNo != null">planBillNo=#{planBillNo},</if>
+            <if test="generatePlan != null">generatePlan=#{generatePlan},</if>
         </trim>
         WHERE id = #{id}
     </update>

api-admin/src/main/resources/mybatis/mapper/purchase/PurApplyDetailDao.xml

@@ -33,7 +33,6 @@
         <where>
             <if test="orderIdFk != '' and orderIdFk != null">
                 AND orderIdFk = #{orderIdFk}
-                AND basic_products.diType=1
             </if>
             <if test="productId != null">
                 AND productId = #{productId}