普耗，收费出库生成单据优化

src/main/java/com/glxp/api/controller/thrsys/ThrInvOrderController.java

@@ -97,6 +97,7 @@ public class ThrInvOrderController {
 
     /**
      * 普耗与收费单据生成
+     *
      * @param generateOrderRequest
      * @param bindingResult
      * @return
@@ -115,6 +116,7 @@ public class ThrInvOrderController {
 
     /**
      * 高值耗材单据生成
+     *
      * @param generateOrderRequest
      * @param bindingResult
      * @return

src/main/java/com/glxp/api/req/thrsys/GenerateOrderRequest.java

@@ -22,7 +22,7 @@ public class GenerateOrderRequest {
     /**
      * 往来单位
      */
-    @NotEmpty(message = "往来单位不能为空！")
+//    @NotEmpty(message = "往来单位不能为空！")
     private String fromCorp;
 
 }

src/main/java/com/glxp/api/service/thrsys/impl/ThrInvOrderServiceImpl.java

@@ -335,12 +335,8 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
         //校验单据的relId有null不生成单据
         if (!inspectionDocuments(thrInvOrderDetails)) return false;
 
-        //todo 如果是患者收费明细需要根据患者进行分组拆单而且往来单位为患者信息
-
-
         BasicBussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findByAction(generateOrderRequest.getAction());
 
-        List<String> fromCorpList = new ArrayList<>();
         Map<String, List<ThrInvOrderDetail>> grouped = new HashMap<>();
         //往来类型为患者，则需要根据患者进行拆单
         if (bussinessTypeEntity.getCorpType() == ConstantStatus.CORP_TYPE_INPUT) {
@@ -370,7 +366,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
             Long userId = customerService.getUserId();
             ioOrderEntity.setCreateUser(userId + "");
             ioOrderEntity.setUpdateUser(userId + "");
-            ioOrderEntity.setOrderType(ConstantStatus.ORDER_TYPE_SCAN);//正常单据处理
+            ioOrderEntity.setOrderType(ConstantStatus.ORDER_TYPE_BIZ);//正常单据处理
 
             List<IoOrderDetailBizEntity> newOrderDetailBiz = new ArrayList<>(grouped.values().size());
             if (!copyOrderDetailBiz(entry.getValue(), newOrderDetailBiz, newBillNo)) {
@@ -490,7 +486,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
         StringBuilder exmsg = new StringBuilder("");
 
         Integer skProject = thrInvOrder.getSkProject();
-        if (skProject == 1) {//走组套
+        if (thrInvOrder.getSourceType() == Constant.THR_INV_SF_ORDER_TYPE) {//走组套
             thrInvOrderDetails.forEach(item -> {
                 Long relId = item.getRelId();
                 if (ObjectUtil.isNull(relId)) {
@@ -721,6 +717,7 @@ public class ThrInvOrderServiceImpl implements ThrInvOrderService {
             ioOrderDetailBizEntity.setId(IdUtil.getSnowflakeNextId());
             ioOrderDetailBizEntity.setUuidFk(basicProductsEntity.getUuid());
             ioOrderDetailBizEntity.setBindRlFk(basicProductsEntity.getId());
+            ioOrderDetailBizEntity.setSupId(thrInvOrderDetail.getSupId());
             ioOrderDetailBizEntity.setNameCode(basicProductsEntity.getNameCode());
             ioOrderDetailBizEntity.setCount(Integer.valueOf(thrInvOrderDetail.getReCount()));
             ioOrderDetailBizEntity.setBatchNo(thrInvOrderDetail.getBatchNo());

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1228,7 +1228,8 @@
         INTO basic_udirel
         (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
         isLock,
-                 lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+        lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+        createUser,
         updateUser,
         remark, useExpireTime, dispatch, groupBuy, needCert)
         values (#{id},
@@ -1263,7 +1264,8 @@
         INTO basic_udirel
         (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
         isLock,
-                 lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+        lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+        createUser,
         updateUser,
         remark, useExpireTime, dispatch, groupBuy, needCert)
         values (#{id},
@@ -1438,7 +1440,8 @@
         into basic_udirel
         (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
         isLock,
-        lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+        lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+        createUser,
         updateUser,
         remark, useExpireTime, dispatch, groupBuy, needCert)
         values
@@ -1811,6 +1814,7 @@
 
     <select id="selectProductByRelIds" resultType="com.glxp.api.entity.basic.BasicProductsEntity">
         select bu.id,
+        basic_products.uuid,
         basic_products.originUuid,
         basic_products.nameCode,
         basic_products.deviceRecordKey,
@@ -1944,5 +1948,4 @@
         ON bu.uuid = basic_products.uuid
         where basic_products.nameCode = #{nameCode}
     </select>
-
 </mapper>