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

src/main/java/com/glxp/api/dao/inout/IoOrderDetailBizDao.java

@@ -34,6 +34,7 @@ public interface IoOrderDetailBizDao extends BaseMapperPlus<IoOrderDetailBizDao,
 
     IoOrderInvoiceResponse selectByinvoiceId(Long id);
 
+    IoOrderDetailBizEntity findByRelBatch(@Param("orderId") String orderId, @Param("relId") Long relId, @Param("bacthNo") String bacthNo);
 
     /**
      * 查询单条单据业务详情

src/main/java/com/glxp/api/http/ErpOrderClient.java

@@ -61,85 +61,5 @@ public class ErpOrderClient {
         return null;
     }
 
-    public List<ThrErpOrderResponse> getErpOrder(FilterThrOrderRequest filterOrderRequest) {
-        try {
-            BaseResponse<PageSimpleResponse<ThrOrderResponse>> responseBaseResponse = getThrOrderResponse(filterOrderRequest);
-            List<ThrOrderResponse> purchaseinResponseList = responseBaseResponse.getData().getList();
-            if (purchaseinResponseList != null && purchaseinResponseList.size() > 0) {
-                List<ThrErpOrderResponse> erpOrderEntities = new ArrayList<>();
-                for (ThrOrderResponse ThrOrderResponse : purchaseinResponseList) {
-                    for (ThrOrderResponse.SubErpOrder subPurchase : ThrOrderResponse.getSubErpOrders()) {
-                        ThrErpOrderResponse ThrErpOrderResponse = new ThrErpOrderResponse();
-                        ThrErpOrderResponse.setErpOrderId(ThrOrderResponse.getBillNo());
-                        ThrErpOrderResponse.setCompanyid(ThrOrderResponse.getCorpId());
-                        ThrErpOrderResponse.setCompanyname(ThrOrderResponse.getCorpName());
-                        ThrErpOrderResponse.setCredate(ThrOrderResponse.getBilldate());
-                        ThrErpOrderResponse.setGoodsid(subPurchase.getProductId());
-                        ThrErpOrderResponse.setGoodsname(subPurchase.getProductName());
-                        ThrErpOrderResponse.setBatchNo(subPurchase.getBatchNo());
-                        ThrErpOrderResponse.setProductDate(subPurchase.getProductDate());
-                        ThrErpOrderResponse.setExpireDate(subPurchase.getExpireDate());
-                        ThrErpOrderResponse.setErpCount(subPurchase.getCount());
-                        ThrErpOrderResponse.setReCount(subPurchase.getReCount());
-                        ThrErpOrderResponse.setOriginType(ThrOrderResponse.getOriginType());
-                        ThrErpOrderResponse.setGoodsunit(subPurchase.getSpec());
-                        ThrErpOrderResponse.setOrderFromType(ConstantStatus.SORDER_FROM_ONLINE);
-                        erpOrderEntities.add(ThrErpOrderResponse);
-                    }
-                }
-                return erpOrderEntities;
-            }
-        } catch (
-                Exception e) {
-            e.printStackTrace();
-        }
-        return null;
-    }
-
-
-//    public BaseResponse submitOrder(UdiwmsOrderRequest udiwmsOrderRequest) {
-//        BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(udiwmsOrderRequest.getThirdSys());
-//        String url = basicThirdSysEntity.getThridUrl() + "/udiwms/erp/submitOrders";
-//        String response = httpOkClient.uCloudPost(url, udiwmsOrderRequest);
-//        try {
-//            BaseResponse<PageSimpleResponse<ThrOrderResponse>> responseBaseResponse =
-//                    JSONObject.parseObject(response, new TypeReference<BaseResponse<PageSimpleResponse<ThrOrderResponse>>>() {
-//                    });
-//            return responseBaseResponse;
-//        } catch (Exception e) {
-//            log.error("获取订单数据异常", e);
-//        }
-//        return null;
-//    }
-
-
-//    public BaseResponse postBill(Map<String, List<ThrErpOrderResponse>> postMap, String billAction, String uploadUrl, String thirdSysFk) {
-//        ERPPostBillRequest erpPostBillRequest = new ERPPostBillRequest();
-//        erpPostBillRequest.setPostMap(postMap);
-//        erpPostBillRequest.setBillAction(billAction);
-//
-//        //查询第三方服务授权参数
-//        BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectByThirdId(thirdSysFk);
-//        String response = httpOkClient.uCloudPost(uploadUrl, erpPostBillRequest, basicThirdSysEntity);
-//        BaseResponse baseResponse = JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
-//        });
-//        return baseResponse;
-//    }
-//
-//    public BaseResponse postBill(ERPPostBillRequest erpPostBillRequest, String uploadUrl) {
-//        String response = httpOkClient.uCloudPost(uploadUrl, erpPostBillRequest);
-//        BaseResponse baseResponse =
-//                JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
-//                });
-//        return baseResponse;
-//    }
-//
-//    public BaseResponse signBill(USignRequest signRequest, String url) {
-//        String response = httpOkClient.uCloudPost(url, signRequest);
-//        BaseResponse baseResponse =
-//                JSONObject.parseObject(response, new TypeReference<BaseResponse>() {
-//                });
-//        return baseResponse;
-//    }
 
 }

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

@@ -11,6 +11,7 @@ import com.glxp.api.entity.basic.BasicBussinessTypeEntity;
 import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.inout.*;
 import com.glxp.api.entity.inv.InvPreInProductDetailEntity;
+import com.glxp.api.entity.system.SystemParamConfigEntity;
 import com.glxp.api.res.inout.IoOrderCheckResultResponse;
 import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
@@ -18,6 +19,7 @@ import com.glxp.api.service.auth.InvWarehouseService;
 import com.glxp.api.service.basic.IBasicBussinessTypeService;
 import com.glxp.api.service.inv.InvPreinDetailService;
 import com.glxp.api.service.inv.InvPreinProductDetailService;
+import com.glxp.api.service.system.SystemParamConfigService;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.GennerOrderUtils;
 import com.glxp.api.util.IntUtil;
@@ -306,14 +308,27 @@ public class IoCheckInoutService {
         }
     }
 
+    SystemParamConfigService systemParamConfigService;
+
     public String checkCode(IoCodeTempEntity codeEntity) {
 
+        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("only_vail_batch");
+        boolean vailBatchNo = false;
+        if (systemParamConfigEntity != null) {
+            if (systemParamConfigEntity.getParamValue().equals(1)) {
+                vailBatchNo = true;
+            }
+        }
         boolean isBillExit = orderDetailBizService.isExit(codeEntity.getOrderId());
         if (!isBillExit) {
             return "请先录入业务详情";
         }
-
+        IoOrderDetailBizEntity bizEntity = null;
-        IoOrderDetailBizEntity bizEntity = orderDetailBizService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo(), codeEntity.getProduceDate(), codeEntity.getExpireDate());
+        if (vailBatchNo) {
+            bizEntity = orderDetailBizService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo());
+        } else {
+            bizEntity = orderDetailBizService.findByUnique(codeEntity.getOrderId(), codeEntity.getRelId(), codeEntity.getBatchNo(), codeEntity.getProduceDate(), codeEntity.getExpireDate());
+        }
         if (bizEntity == null) {
             return "非此单产品!";
         }
@@ -1120,6 +1135,12 @@ public class IoCheckInoutService {
     }
 
     public String checkProductDate(IoOrderDetailBizEntity bizEntity, IoOrderDetailCodeEntity codeEntity) {
+
+        String value = systemParamConfigService.selectValueByParamKey("only_vail_batch");
+        if (StrUtil.isNotEmpty(value) && value.equals("1")) {
+            return null;
+        }
+
         if (StrUtil.nullToEmpty(bizEntity.getProductDate()).equals(StrUtil.nullToEmpty(codeEntity.getProductDate()))) {
             return null;
         } else {
@@ -1128,6 +1149,10 @@ public class IoCheckInoutService {
     }
 
     public String checkExpireDate(IoOrderDetailBizEntity bizEntity, IoOrderDetailCodeEntity codeEntity) {
+        String value = systemParamConfigService.selectValueByParamKey("only_vail_batch");
+        if (StrUtil.isNotEmpty(value) && value.equals("1")) {
+            return null;
+        }
         if (StrUtil.nullToEmpty(bizEntity.getExpireDate()).equals(StrUtil.nullToEmpty(codeEntity.getExpireDate()))) {
             return null;
         } else {

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

@@ -33,6 +33,7 @@ public interface IoOrderDetailBizService {
     boolean isExit(Long relId, String bacthNo, Long ignoreId, String orderId);
 
     IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo, String productDate, String expireDate);
+    IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo);
 
 
     IoOrderDetailBizEntity findByRelId(String orderId, Long relId);

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

@@ -96,8 +96,13 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     }
 
     @Override
-    public IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String bacthNo, String productDate, String expireDate) {
+    public IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String batchNo, String productDate, String expireDate) {
-        return ioOrderDetailBizDao.selectOrderDetailBiz(orderId, relId, bacthNo, productDate, expireDate);
+        return ioOrderDetailBizDao.selectOrderDetailBiz(orderId, relId, batchNo, productDate, expireDate);
+    }
+
+    @Override
+    public IoOrderDetailBizEntity findByUnique(String orderId, Long relId, String batchNo) {
+        return ioOrderDetailBizDao.findByRelBatch(orderId, relId, batchNo);
     }
 
     @Override

src/main/java/com/glxp/api/service/thrsys/ThrOrdersDlService.java

@@ -352,61 +352,6 @@ public class ThrOrdersDlService {
         }
         return -1;
     }
-
-    //
-//    public List<List<String>> exportThrOrders(FilterThrOrderRequest filterThrOrderRequest) {
-//        BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
-//        bussinessTypeFilterRequest.setEnabled(true);
-//        List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.filterList(bussinessTypeFilterRequest);
-//        BasicThirdSysDetailEntity basicThirdSysDetailEntity = basicThirdSysDetailService.selectByKey("orderQueryUrl", filterThrOrderRequest.getThirdSysFk());
-//        int page = 1;
-//        int limit = 100;
-//        List<ErpOrderResponse> erpOrderResponseList = new ArrayList<>();
-//        while (true) {
-//            List<ErpOrderResponse> datas = getThrOrders(page, limit, basicThirdSysDetailEntity.getValue(), filterThrOrderRequest);
-//            if (datas != null && datas.size() >= limit) {
-//                erpOrderResponseList.addAll(datas);
-//                page++;
-//
-//            } else {
-//                if (datas != null) {
-//                    erpOrderResponseList.addAll(datas);
-//                }
-//                break;
-//            }
-//        }
-//        List<List<String>> excelData = new ArrayList<>();
-//        for (ErpOrderResponse erpOrderResponse : erpOrderResponseList) {
-//            for (ErpOrderResponse.SubErpOrder subPurchase : erpOrderResponse.getSubErpOrders()) {
-//                List<String> rows = new ArrayList<>();
-//                rows.add(erpOrderResponse.getBillNo());
-//                rows.add(erpOrderResponse.getBilldate());
-//                BasicUnitMaintainEntity basicUnitMaintainEntity = basicUnitMaintainService.selectByThirdId(erpOrderResponse.getCorpId(), filterThrOrderRequest.getThirdSysFk());
-////                if (basicUnitMaintainEntity != null)
-////                    rows.add(basicUnitMaintainEntity.getErpId());
-////                else
-//                rows.add(erpOrderResponse.getCorpId());
-////                rows.add(basicUnitMaintainEntity.getErpId());
-////                rows.add(erpOrderResponse.getCorpId());
-//                rows.add(erpOrderResponse.getCorpName());
-//                rows.add(getName(bussinessTypeEntities, erpOrderResponse.getBillType()));
-////                rows.add(erpOrderResponse.getBillType());
-//                rows.add(erpOrderResponse.getBillFlag());
-//                rows.add(subPurchase.getProductId());
-//                rows.add(subPurchase.getProductName());
-//                rows.add(subPurchase.getSpec());
-//                rows.add(subPurchase.getBatchNo());
-//                rows.add(subPurchase.getProductDate());
-//                rows.add(subPurchase.getExpireDate());
-//                rows.add(subPurchase.getCount() + "");
-//                rows.add(subPurchase.getReCount() + "");
-//                rows.add(erpOrderResponse.getOriginType());
-//                excelData.add(rows);
-//            }
-//        }
-//        return excelData;
-//    }
-//
     public List<ThrOrderResponse> getThrOrders(FilterThrOrderRequest filterThrOrderRequest) {
         ThrSystemDetailEntity thrSystemDetailEntity = thrSystemDetailService.selectByKey("orderQueryUrl", filterThrOrderRequest.getThirdSysFk());
         int page = 1;

src/main/resources/mybatis/mapper/inout/IoOrderDetailBizDao.xml

@@ -117,6 +117,27 @@
                 AND (expireDate is null or expireDate = '')
             </if>
         </where>
+        limit 1
+    </select>
+
+    <select id="findByRelBatch" resultType="com.glxp.api.entity.inout.IoOrderDetailBizEntity">
+        select *
+        from io_order_detail_biz
+        <where>
+            <if test="orderId != null and orderId != ''">
+                AND orderIdFk = #{orderId}
+            </if>
+            <if test="relId != null">
+                AND bindRlFk = #{relId}
+            </if>
+            <if test="batchNo != null and batchNo != ''">
+                AND batchNo = #{batchNo}
+            </if>
+            <if test="batchNo == null || batchNo == ''">
+                AND (batchNo is null or batchNo = '')
+            </if>
+        </where>
+        limit 1
     </select>
 
     <select id="getfilterOrderList" resultType="com.glxp.api.res.inout.IoOrderDetailResultResponse">