选入阿里单据

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -775,6 +775,7 @@ public class IoOrderDetailBizController extends BaseController {
             if (i == 0) {
                 addBizProductReqeust.setOrderEntity(ioOrderEntity);
             }
+            addBizProductReqeust.setProductType(udiRelevanceResponse.getProductType());
             BaseResponse response = orderDetailBizService.addBizProduct(addBizProductReqeust);
             if (response.getCode() != 20000) {
                 return response;
@@ -791,12 +792,12 @@ public class IoOrderDetailBizController extends BaseController {
                 AliYljgBillDetailDrugCode aliYljgBillDetailDrugCode = aliYljgBillDetailDrugCodeList.get(j);
                 addOrderRequest.setCode(aliYljgBillDetailDrugCode.getCode());
 
-                IoCodeLostEntity codeLostEntity = ioCodeLostService.findByCode(code);
+                IoCodeLostEntity codeLostEntity = ioCodeLostService.findByCode(aliYljgBillDetailDrugCode.getCode());
                 if (codeLostEntity == null) {
                     codeLostEntity = new IoCodeLostEntity();
                     codeLostEntity.setId(IdUtil.getSnowflakeNextId());
                     codeLostEntity.setNameCode(nameCode);
-                    codeLostEntity.setCode(code);
+                    codeLostEntity.setCode(aliYljgBillDetailDrugCode.getCode());
                     codeLostEntity.setBatchNo(aliYljgBillDetailDrug.getProduceBatchNo());
                     if (StrUtil.isNotEmpty(aliYljgBillDetailDrug.getProduceDate())) {
                         codeLostEntity.setProduceDate(aliYljgBillDetailDrug.getProduceDate().substring(2).replace(" 00:00:00", "").replace("-", ""));

src/main/java/com/glxp/api/req/inout/AddBizProductReqeust.java

@@ -22,6 +22,7 @@ public class AddBizProductReqeust {
     private String productDate;
     private String expireDate;
     private Integer count;
+    private Integer productType;
 
     List<AddBizProductReqeust> datas;           //多选添加
     AliYljgSearchbill aliData;           //多选添加

src/main/java/com/glxp/api/service/inout/IoCheckInoutService.java

@@ -334,7 +334,7 @@ public class IoCheckInoutService {
         if (vailBatchNo) {
             bizEntity = orderDetailBizService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo());
         } else {
-            bizEntity = orderDetailBizService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo(), null, null);
+            bizEntity = orderDetailBizService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo(), codeEntity.getProduceDate(), codeEntity.getExpireDate());
         }
         if (bizEntity == null) {
             return "非此单产品!";

src/main/java/com/glxp/api/service/inout/IoOrderDetailBizService.java

@@ -40,6 +40,7 @@ public interface IoOrderDetailBizService {
     IoOrderDetailBizEntity findByRelId(String orderId, Long relId);
 
     List<IoOrderDetailBizResponse> filterList(FilterOrderDetailBizRequest orderDetailBizRequest);
+
     List<IoOrderDetailBizResponse> filterDrugList(FilterOrderDetailBizRequest orderDetailBizRequest);
 
     List<IoOrderDetailCodeResponse> getfilterList(FilterOrderDetailCodeRequest orderDetailBizRequest);
@@ -60,6 +61,7 @@ public interface IoOrderDetailBizService {
 
     /**
      * 复制单据内容
+     *
      * @param newBillNo
      * @param oldBillNo
      */

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -330,6 +330,7 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
             orderEntity.setDeptCode(invWarehouseEntity.getParentId());
             orderEntity.setInvCode(orderEntity.getInvCode());
             orderEntity.setBusType(bussinessTypeEntity.getBusType());
+            orderEntity.setProductType(addBizProductReqeust.getProductType());
             orderService.insertOrder(orderEntity);
         }
 

src/main/java/com/glxp/api/util/udi/UdiCalCountUtil.java

@@ -72,6 +72,7 @@ public class UdiCalCountUtil {
     public int getActCountByRelId(String relId) {
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByRelId(relId);
         int count = getActCount(udiRelevanceResponse);
+
         return count;
     }