同步自助平台代码

api-admin/src/main/java/com/glxp/api/admin/constant/ConstantType.java

@@ -18,6 +18,6 @@ public interface ConstantType {
    String TYPE_CODE_DESTORY = "CodeDestory";    //码注销
    String TYPE_STOCK_CHECK = "StockCheck"; //盘点
 
-   String TYPE_PUT = "WareHouseIn";             //出库
+   String TYPE_PUT = "WareHouseIn";             //入库
-   String TYPE_OUT = "WareHouseOut";             //入库
+   String TYPE_OUT = "WareHouseOut";             //出库
 }

api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiContrastController.java

@@ -13,6 +13,7 @@ import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.admin.httpclient.UdiDlHttpClient;
 import com.glxp.api.admin.req.basic.CombineRequest;
 import com.glxp.api.admin.req.basic.RemoveRelRequest;
+import com.glxp.api.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.api.admin.req.receipt.ProductInfoFilterRequest;
 import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
@@ -128,7 +129,9 @@ public class UdiContrastController {
         String time = DateUtil.formatDateTime(new Date());
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
-        udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+        UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+        BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+        udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         return ResultVOUtils.success("切换成功！");
     }
 
@@ -155,7 +158,9 @@ public class UdiContrastController {
             return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
         } else {
             try {
-                udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+                UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+                BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+                udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
             } catch (Exception e) {
                 return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");
             }
@@ -205,7 +210,9 @@ public class UdiContrastController {
             combineRequest.setRelId(removeRelRequest.getRelId());
             udiRelevanceEntity.setSupName("");
             udiRelevanceEntity.setPrice("");
-            udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+            UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+            BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+            udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         } catch (Exception e) {
             e.printStackTrace();
             return ResultVOUtils.error(500, "解除绑定失败！");
@@ -323,7 +330,9 @@ public class UdiContrastController {
         udiInfoEntity.setScbssfbhsxrq("是");
         udiInfoEntity.setScbssfbhxlh("否");
         udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
-        udiInfoService.insertUdiInfo(udiInfoEntity);
+        UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+        BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+        udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
     }
 
     public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) {
@@ -333,7 +342,9 @@ public class UdiContrastController {
         String time = DateUtil.getDateTime();
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
-        udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+        UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+        BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+        udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         insertUdiInfos(udiInfoEntities);
     }
 

api-admin/src/main/java/com/glxp/api/admin/controller/basic/UdiRelevanceController.java

@@ -294,7 +294,9 @@ public class UdiRelevanceController {
         String time = DateUtil.getDateTime();
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
-        udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+        UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+        BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+        udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         return ResultVOUtils.success("更新成功");
     }
 
@@ -468,12 +470,12 @@ public class UdiRelevanceController {
                 String time = DateUtil.getDateTime();
                 udiRelevanceEntity.setUpdateTime(time);
                 udiRelevanceEntity.setModifyTime(time);
-                UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+                UdiInfoReqeust udiInfoReqeust = new UdiInfoReqeust();
-                udiInfoEntity.setYbbm(postSmpUdiInfoRequest.getYbbm());
+                udiInfoReqeust.setYbbm(postSmpUdiInfoRequest.getYbbm());
-                udiInfoEntity.setSptm(postSmpUdiInfoRequest.getSptm());
+                udiInfoReqeust.setSptm(postSmpUdiInfoRequest.getSptm());
-                BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoEntity);
+                BeanUtils.copyProperties(postSmpUdiInfoRequest, udiInfoReqeust);
-                udiInfoEntity.setUuid(udiRelevanceEntity.getUuid());
+                udiInfoReqeust.setUuid(udiRelevanceEntity.getUuid());
-                udiInfoService.insertUdiInfo(udiInfoEntity);
+                udiInfoService.insertUdiInfo(udiInfoReqeust);
                 udiRelevanceEntity.setId(gennerOrderUtils.getRelId() + "");
                 udiRelevanceService.insertUdiRelevance(udiRelevanceEntity);
             }
@@ -652,23 +654,25 @@ public class UdiRelevanceController {
         }
         BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
         ThrProductsEntity thrProductsEntity = thrDataService.getProducts(udiRelevanceEntity.getMainId(), basicThirdSysEntity.getThirdId());
-        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+        UdiInfoReqeust UdiInfoRequest = new UdiInfoReqeust();
-        BeanUtils.copyProperties(thrProductsEntity, udiInfoEntity);
+        BeanUtils.copyProperties(thrProductsEntity, UdiInfoRequest);
-        udiInfoEntity.setNameCode(thrProductsEntity.getCode());
+        UdiInfoRequest.setNameCode(thrProductsEntity.getCode());
-        udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
+        UdiInfoRequest.setCpmctymc(thrProductsEntity.getName());
-        udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
+        UdiInfoRequest.setManufactory(thrProductsEntity.getManufactory());
-        udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
+        UdiInfoRequest.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
-        udiInfoEntity.setGgxh(thrProductsEntity.getSpec());
+        UdiInfoRequest.setGgxh(thrProductsEntity.getSpec());
-        udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
+        UdiInfoRequest.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
-        udiInfoEntity.setUuid(CustomUtil.getUUId());
+        UdiInfoRequest.setUuid(CustomUtil.getUUId());
-        udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
+        UdiInfoRequest.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
-        udiInfoEntity.setDiType(1);
+        UdiInfoRequest.setDiType(1);
-        udiInfoService.insertUdiInfo(udiInfoEntity);
+        udiInfoService.insertUdiInfo(UdiInfoRequest);
-        udiRelevanceEntity.setUuid(udiInfoEntity.getUuid());
+        udiRelevanceEntity.setUuid(UdiInfoRequest.getUuid());
         String time = DateUtil.getDateTime();
         udiRelevanceEntity.setUpdateTime(time);
         udiRelevanceEntity.setModifyTime(time);
-        udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+        UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+        BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+        udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         return ResultVOUtils.success("解除绑定成功！");
     }
 
@@ -688,7 +692,9 @@ public class UdiRelevanceController {
                 UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity();
                 udiRelevanceEntity.setId(id);
                 udiRelevanceEntity.setLockStatus(lockUdiRequest.getLockStatus());
-                udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+                UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+                BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+                udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
             }
             return ResultVOUtils.success("更新成功！");
         } else {

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockOrderController.java

@@ -731,7 +731,7 @@ public class StockOrderController {
      */
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/stock/order/received/rollback")
-    public BaseResponse rollbackOrder(String billNo) {
+    public BaseResponse rollbackOrder(String billNo,Integer contrastStatus) {
         if (StrUtil.isBlank(billNo)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
@@ -743,7 +743,7 @@ public class StockOrderController {
         if (orderEntity.getExportStatus() == ConstantStatus.ORDER_EXPORT_ED) {
             return ResultVOUtils.error(500, "单据已同步到内网UDI管理系统，无法撤回！");
         }
-        boolean result = stockOrderService.rollbackOrder(billNo);
+        boolean result = stockOrderService.rollbackOrder(billNo,contrastStatus);
         if (result) {
             return ResultVOUtils.success();
         }
@@ -753,11 +753,11 @@ public class StockOrderController {
     //未验收单据撤回到等待校验
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/stock/order/unReceive/rollback")
-    public BaseResponse rollUnReceivebackOrder(String billNo) {
+    public BaseResponse rollUnReceivebackOrder(String billNo,Integer contrastStatus) {
         if (StrUtil.isBlank(billNo)) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         }
-        boolean result = stockOrderService.rollbackOrder(billNo);
+        boolean result = stockOrderService.rollbackOrder(billNo,contrastStatus);
         if (result) {
             return ResultVOUtils.success("撤回成功！");
         }

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

@@ -118,7 +118,8 @@ public class StockOrderDetailController {
                 if (CollUtil.isNotEmpty(codeList)) {
                     for (WarehouseEntity codeDetaiEntity : codeList) {
                         if (StrUtil.trimToEmpty(codeDetaiEntity.getRelId()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getRelId()))
-                                && StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo()))
+                                &&
+                                (StrUtil.isEmpty(codeDetaiEntity.getBatchNo()) || StrUtil.trimToEmpty(codeDetaiEntity.getBatchNo()).equals(StrUtil.trimToEmpty(stockOrderDetailEntity.getBatchNo())))
                         ) {
                             StockOrderDetailEntity item = new StockOrderDetailEntity();
                             BeanUtils.copyProperties(stockOrderDetailEntity, item);

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java

@@ -45,6 +45,7 @@ import com.glxp.api.admin.service.inventory.StockPrintTempService;
 import com.glxp.api.admin.thread.IoTransInoutService;
 import com.glxp.api.admin.thread.JaspaperService;
 import com.glxp.api.admin.util.CustomUtil;
+import com.glxp.api.admin.util.DateUtil;
 import com.glxp.api.admin.util.FileUtils;
 import com.glxp.api.admin.util.JasperUtils;
 import com.glxp.api.common.enums.ResultEnum;
@@ -414,6 +415,14 @@ public class StockQRCodeTextController {
                     stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
                     stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
                     stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
+
+                    if (StrUtil.isNotEmpty(stockOrderPrintEntity.getProductDate())) {
+                        stockOrderPrintEntity.setProductDate(DateUtil.formatExpireTime("20" + stockOrderPrintEntity.getProductDate()));
+                    }
+                    if (StrUtil.isNotEmpty(stockOrderPrintEntity.getExpireDate())) {
+                        stockOrderPrintEntity.setExpireDate(DateUtil.formatExpireTime("20" + stockOrderPrintEntity.getExpireDate()));
+                    }
+
                     if (orderEntity != null)
                         stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
                     if (systemParamConfigEntity.getParamValue().equals("1")) {
@@ -464,6 +473,13 @@ public class StockQRCodeTextController {
                     StockOrderDetailEntity stockOrderDetailEntity = getDetailByRelBatch(stockOrderDetailEntities, stockOrderPrintEntity.getProductId(), stockOrderPrintEntity.getBatchNo());
                     if (stockOrderDetailEntity != null) {
                         stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice());
+                        stockOrderPrintEntity.setZczbhhzbapzbh(stockOrderDetailEntity.getZczbhhzbapzbh());
+                        if (StrUtil.isNotEmpty(stockOrderDetailEntity.getProductDate())) {
+                            stockOrderPrintEntity.setProductDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getProductDate()));
+                        }
+                        if (StrUtil.isNotEmpty(stockOrderDetailEntity.getExpireDate())) {
+                            stockOrderPrintEntity.setExpireDate(DateUtil.formatExpireTime("20" + stockOrderDetailEntity.getExpireDate()));
+                        }
                     }
 
                     stockOrderPrintEntity.setCount(stockOrderPrintEntity.getCount() * getActCount(stockOrderPrintEntity));

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvPreInProductsController.java

@@ -7,6 +7,8 @@ import com.glxp.api.admin.annotation.AuthRuleAnnotation;
 import com.glxp.api.admin.constant.Constant;
 import com.glxp.api.admin.constant.ConstantStatus;
 import com.glxp.api.admin.constant.ConstantType;
+import com.glxp.api.admin.dao.business.StockOrderDao;
+import com.glxp.api.admin.entity.business.StockOrderEntity;
 import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.api.admin.entity.inventory.InvProductEntity;
 import com.glxp.api.admin.req.inout.DeleteRequest;
@@ -40,6 +42,8 @@ public class InvPreInProductsController {
     InvPreInProductService invProductService;
     @Resource
     InvPreInProductDetailService invProductDetailService;
+    @Resource
+    private StockOrderDao stockOrderDao;
 
     @AuthRuleAnnotation("")
     @GetMapping("spms/prein/inv/products/filter")
@@ -53,6 +57,14 @@ public class InvPreInProductsController {
 //            filterInvProductRequest.setSupId(companyEntity.getUnitIdFk());
 //            filterInvProductRequest.setCustomerId(null);
 //        }
+
+        if(StrUtil.isNotBlank(filterInvProductRequest.getOrderIdFk())){
+            StockOrderEntity stockOrderEntity = stockOrderDao.selectByBillNo(filterInvProductRequest.getOrderIdFk());
+            if(stockOrderEntity !=null && StrUtil.isNotBlank(stockOrderEntity.getOrderIdFk())){
+                filterInvProductRequest.setOrderIdFk(stockOrderEntity.getOrderIdFk());
+            }
+        }
+
         List<InvProductResponse> invProductResponses = invProductService.filterJoinInvProduct(filterInvProductRequest);
         PageInfo<InvProductResponse> pageInfo;
         pageInfo = new PageInfo<>(invProductResponses);

api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiInfoDao.java

@@ -2,6 +2,7 @@ package com.glxp.api.admin.dao.basic;
 
 import com.glxp.api.admin.entity.basic.UdiInfoEntity;
 import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.api.admin.req.basic.UdiInfoReqeust;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -21,11 +22,11 @@ public interface UdiInfoDao {
 
     UdiInfoEntity findById(@Param("id") String id);
 
-    boolean insertUdiInfo(UdiInfoEntity udiInfoEntity);
+    boolean insertUdiInfo(UdiInfoReqeust udiInfoReqeust);
 
     boolean insertUdiInfos(@Param("udiInfoEntities") List<UdiInfoEntity> udiInfoEntities);
 
-    boolean updateUdiInfo(UdiInfoEntity udiInfoEntity);
+    boolean updateUdiInfo(UdiInfoReqeust udiInfoReqeust);
 
     boolean deleteById(@Param("id") String id);
 

api-admin/src/main/java/com/glxp/api/admin/dao/basic/UdiRelevanceDao.java

@@ -2,6 +2,7 @@ package com.glxp.api.admin.dao.basic;
 
 import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.api.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -40,7 +41,7 @@ public interface UdiRelevanceDao {
 
     boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity);
 
-    boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
+    boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest);
 
     boolean deleteById(@Param("id") String id);
 

api-admin/src/main/java/com/glxp/api/admin/dao/inout/OrderDao.java

@@ -99,4 +99,11 @@ public interface OrderDao {
      * @param orderEntity
      */
     void updateOrderUploadInfo(OrderEntity orderEntity);
+    /**
+     * 根据扫码单据ID和业务单据ID查询已完成单据
+     *
+     * @param billNo
+     * @return
+     */
+    OrderEntity selectByBillNoAndStatus(String billNo,Integer contrastStatus);
 }

api-admin/src/main/java/com/glxp/api/admin/req/basic/FilterUdiInfoRequest.java

@@ -58,5 +58,6 @@ public class FilterUdiInfoRequest extends ListPageRequest {
     private String unitFk;
     private String originUuid;
     private String relId;
+    private String companyName;
 
 }

api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiInfoReqeust.java

@@ -0,0 +1,83 @@
+package com.glxp.api.admin.req.basic;
+
+import lombok.Data;
+
+@Data
+public class UdiInfoReqeust {
+
+    private Integer id;
+    private String nameCode;
+    private String packRatio;
+    private String packLevel;
+    private Integer bhxjsl;
+    private Integer bhzxxsbzsl;
+    private Integer zxxsbzbhsydysl;
+    private String bhxjcpbm;
+    private String sjcpbm;  //
+    private String bzcj;
+    private String addType;
+    private String deviceRecordKey;
+    private String cpmctymc;
+    private String cplb;
+    private String flbm;
+    private String ggxh;
+    private String qxlb;
+    private String tyshxydm;
+    private String ylqxzcrbarmc;
+    private String zczbhhzbapzbh;
+    private String ylqxzcrbarywmc;
+    private String sydycpbs;
+    private String uuid;
+    private Integer versionNumber;
+    private Integer diType;
+    private String thirdId;
+    private String thirdName;
+    private String ybbm;
+    private String sptm;
+    private String manufactory;
+    private String measname;
+    private Integer productType;
+    private String scbssfbhph;
+    private String scbssfbhxlh;
+    private String scbssfbhscrq;
+    private String scbssfbhsxrq;
+    private String cpms;
+    private String spmc;
+    private String originUuid;
+
+    //本地生成信息
+    private String batchNo;
+    private String produceDate;
+    private String expireDate;
+    private String serialNo;
+    private String udi;
+    private String code;
+    private Integer count;
+    private String warehouseCode;
+    private String udplatCode;
+    private String relId;//关联ID主键
+    private Integer status;
+    private String supId;
+
+    private Boolean isCheck;
+    private Boolean allowNoBatch;
+    private Boolean allowNoExpire;
+    private Boolean allowNoProduct;
+
+    private String price;
+    private String cplx;
+    private String hchzsb;
+
+    //产品代理商
+    private String cpdls;
+
+
+    private String basicPrductRemak1;
+    private String basicPrductRemak2;
+    private String basicPrductRemak3;
+    private String basicPrductRemak4;
+    private String basicPrductRemak5;
+    private String basicPrductRemak6;
+    private String basicPrductRemak7;
+    private String basicPrductRemak8;
+}

api-admin/src/main/java/com/glxp/api/admin/req/basic/UdiRelevanceRequest.java

@@ -0,0 +1,41 @@
+package com.glxp.api.admin.req.basic;
+
+import lombok.Data;
+
+@Data
+public class UdiRelevanceRequest {
+    private String id;
+    private String thirdId;
+    private String thirdName;
+    private String uuid;
+    private Boolean isUseDy;
+    private String updateTime;
+    private String thirdId1;
+    private String thirdId2;
+    private String thirdId3;
+    private String thirdId4;
+    private String thirdName1;
+    private String thirdName2;
+    private String thirdName3;
+    private String thirdName4;
+    private String manufactory;
+    private String measname;
+    private String ybbm;
+    private String sptm;
+    private Boolean isDisable;
+    private Boolean isLock;
+    private String mainId;
+    private String mainName;
+    private Integer lockStatus;
+    private String udplatCode;
+    private Boolean isAdavence;
+    private String supName;
+    private String originUuid;
+    private String price;
+    private String modifyTime; //修改时间
+
+    private Boolean useMuti;      //是否多次使用
+    private Integer useNum;     //最小包装单元可使用次数
+
+
+}

api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiContrastService.java

@@ -10,6 +10,7 @@ import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.admin.httpclient.UdiDlHttpClient;
 import com.glxp.api.admin.req.basic.CombineRequest;
 import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.api.admin.req.basic.UdiInfoReqeust;
 import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.admin.service.thrsys.ThrProductsService;
 import com.glxp.api.admin.util.CustomUtil;
@@ -169,7 +170,9 @@ public class UdiContrastService {
         udiInfoEntity.setScbssfbhsxrq("是");
         udiInfoEntity.setScbssfbhxlh("否");
         udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
-        udiInfoService.insertUdiInfo(udiInfoEntity);
+        UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+        udiInfoService.insertUdiInfo(udiInfoRequest);
     }
 
 

api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiInfoService.java

@@ -3,6 +3,7 @@ package com.glxp.api.admin.service.basic;
 import com.glxp.api.admin.entity.basic.UdiInfoEntity;
 import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.api.admin.req.basic.UdiInfoReqeust;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import org.apache.ibatis.annotations.Param;
 
@@ -25,11 +26,11 @@ public interface UdiInfoService {
 
     List<UdiInfoEntity> findByUuids(String uuid);
 
-    boolean insertUdiInfo(UdiInfoEntity udiInfoEntity);
+    boolean insertUdiInfo(UdiInfoReqeust udiInfoReqeust);
 
     boolean insertUdiInfos(List<UdiInfoEntity> udiInfoEntities);
 
-    boolean updateUdiInfo(UdiInfoEntity udiInfoEntity);
+    boolean updateUdiInfo(UdiInfoReqeust udiInfoReqeust);
 
     boolean deleteById(String id);
 

api-admin/src/main/java/com/glxp/api/admin/service/basic/UdiRelevanceService.java

@@ -2,6 +2,7 @@ package com.glxp.api.admin.service.basic;
 
 import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.api.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 
 import java.util.List;
@@ -53,7 +54,7 @@ public interface UdiRelevanceService {
 
     boolean insertUdiRelevanceignore(UdiRelevanceEntity udiRelevanceEntity);
 
-    boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity);
+    boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest);
 
     boolean deleteById(String id);
 

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java

@@ -7,6 +7,7 @@ import com.glxp.api.admin.dao.thrsys.ThrProductsDao;
 import com.glxp.api.admin.entity.basic.*;
 import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
+import com.glxp.api.admin.req.basic.UdiInfoReqeust;
 import com.glxp.api.admin.res.basic.UdiRelevanceExportJsonResponse;
 import com.glxp.api.admin.service.basic.UdiInfoImportDetailService;
 import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
@@ -14,6 +15,7 @@ import org.apache.ibatis.session.ExecutorType;
 import org.apache.ibatis.session.SqlSession;
 import org.apache.ibatis.session.SqlSessionFactory;
 import org.apache.ibatis.session.TransactionIsolationLevel;
+import org.springframework.beans.BeanUtils;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
@@ -86,7 +88,9 @@ public class UdiInfoImportDetailServiceImpl implements UdiInfoImportDetailServic
                 List<UdiInfoEntity> corpList = udiRelevanceExportJsonResponse.getUdiInfoEntities();
                 UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
                 for (UdiInfoEntity basicUnitMaintainEntity : corpList) {
-                    mapper.insertUdiInfo(basicUnitMaintainEntity);
+                    UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+                    BeanUtils.copyProperties(basicUnitMaintainEntity, udiInfoRequest);
+                    mapper.insertUdiInfo(udiInfoRequest);
                 }
                 batchSession.commit();
             }

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiInfoServiceImpl.java

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.dao.basic.UdiInfoDao;
 import com.glxp.api.admin.entity.basic.UdiInfoEntity;
 import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.api.admin.req.basic.UdiInfoReqeust;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.api.admin.service.basic.UdiInfoService;
 import com.glxp.api.admin.util.FilterUdiUtils;
@@ -91,8 +92,8 @@ public class UdiInfoServiceImpl implements UdiInfoService {
     }
 
     @Override
-    public boolean insertUdiInfo(UdiInfoEntity udiInfoEntity) {
+    public boolean insertUdiInfo(UdiInfoReqeust udiInfoReqeust) {
-        return udiInfoDao.insertUdiInfo(udiInfoEntity);
+        return udiInfoDao.insertUdiInfo(udiInfoReqeust);
     }
 
     @Override
@@ -101,8 +102,8 @@ public class UdiInfoServiceImpl implements UdiInfoService {
     }
 
     @Override
-    public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) {
+    public boolean updateUdiInfo(UdiInfoReqeust udiInfoReqeust) {
-        return udiInfoDao.updateUdiInfo(udiInfoEntity);
+        return udiInfoDao.updateUdiInfo(udiInfoReqeust);
     }
 
     @Override

api-admin/src/main/java/com/glxp/api/admin/service/basic/impl/UdiRelevanceServiceImpl.java

@@ -10,6 +10,7 @@ import com.glxp.api.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.api.admin.entity.basic.UdiInfoEntity;
 import com.glxp.api.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.api.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.api.admin.service.basic.BasicThirdSysService;
 import com.glxp.api.admin.service.basic.UdiRelevanceService;
@@ -278,30 +279,30 @@ public class UdiRelevanceServiceImpl implements UdiRelevanceService {
     }
 
     @Override
-    public boolean updateUdiRelevance(UdiRelevanceEntity udiRelevanceEntity) {
+    public boolean updateUdiRelevance(UdiRelevanceRequest udiRelevanceRequest) {
         BasicThirdSysEntity basicThirdSysEntity = basicThirdSysService.selectMainThrSys();
         String mainSys = basicThirdSysEntity.getThirdId();
         if (mainSys.equals("thirdId")) {
-            udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId());
+            udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId());
-            udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName());
+            udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName());
         } else if (mainSys.equals("thirdId1")) {
-            udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId1());
+            udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId1());
-            udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName1());
+            udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName1());
         } else if (mainSys.equals("thirdId2")) {
-            udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId2());
+            udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId2());
-            udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName2());
+            udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName2());
         } else if (mainSys.equals("thirdId3")) {
-            udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId3());
+            udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId3());
-            udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName3());
+            udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName3());
         } else if (mainSys.equals("thirdId4")) {
-            udiRelevanceEntity.setMainId(udiRelevanceEntity.getThirdId4());
+            udiRelevanceRequest.setMainId(udiRelevanceRequest.getThirdId4());
-            udiRelevanceEntity.setMainName(udiRelevanceEntity.getThirdName4());
+            udiRelevanceRequest.setMainName(udiRelevanceRequest.getThirdName4());
         }
 
         UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
-        BeanUtil.copyProperties(udiRelevanceEntity, udiInfoEntity);
+        BeanUtil.copyProperties(udiRelevanceRequest, udiInfoEntity);
         udiInfoDao.updateUdiInfoByUuid(udiInfoEntity);
-        return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity);
+        return udiRelevanceDao.updateUdiRelevance(udiRelevanceRequest);
     }
 
     @Override

api-admin/src/main/java/com/glxp/api/admin/service/business/StockOrderService.java

@@ -68,5 +68,8 @@ public interface StockOrderService {
      */
     List<StockOrderEntity> filter(StockOrderUploadRequest request);
 
-    boolean rollbackOrder(String billNo);
+
+
+    boolean rollbackOrder(String billNo,Integer contrastStatus);
+
 }

api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java

@@ -337,11 +337,11 @@ public class StockOrderServiceImpl implements StockOrderService {
     }
 
     @Override
-    public boolean rollbackOrder(String billNo) {
+    public boolean rollbackOrder(String billNo,Integer contrastStatus) {
         //查询业务单据
         StockOrderEntity stockOrderEntity = stockOrderDao.selectByBillNo(billNo);
         //查询扫码单据
-        OrderEntity orderEntity = orderDao.selectByBillNo(billNo);
+        OrderEntity orderEntity = orderDao.selectByBillNoAndStatus(billNo,contrastStatus);
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
         if (stockOrderEntity.getStatus().equals(ConstantStatus.SORDER_CHECKED)) {
             //回退未验收单据
@@ -381,48 +381,51 @@ public class StockOrderServiceImpl implements StockOrderService {
                     不是预验收单据，则正常扣减库存，回滚业务单据状态
             */
             if (isPreInOrder(orderEntity)) {
-                //查询预验收库库存详情
+
-                FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
-                filterInvProductDetailRequest.setOrderIdFk(orderEntity.getId());
-                List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
-                List<InvProductEntity> invPreInProductList = new ArrayList<>();
-                for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
-                    FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
-                    filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk());
-                    filterInvProductRequest.setSupId(invProductDetailEntity.getSupId());
-                    filterInvProductRequest.setInvWarehouseCode(invProductDetailEntity.getInvWarehouseCode());
-                    filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode());
-                    if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) {
-                        filterInvProductRequest.setBatchNo("empty");
-                    } else {
-                        filterInvProductRequest.setBatchNo(invProductDetailEntity.getBatchNo());
-                    }
-                    List<InvProductEntity> invProductEntities = invPreInProductDao.filterInvProduct(filterInvProductRequest);
-                    if (CollUtil.isNotEmpty(invProductEntities) && invProductEntities.size() > 0) {
-                        InvProductEntity invProductEntity = invProductEntities.get(0);
-                        calculateInvCount(invProductEntity, invProductDetailEntity);
-                        invPreInProductList.add(invProductEntity);
-                    } else {
-                        return false;
-                    }
-                }
-                //删除库存详情
                 invPreInProductDetailDao.deleteByOrderId(orderEntity.getId());
-                //更新库存
+                invPreInProductDao.deleteByOrderIdFk(orderEntity.getId());
-                for (InvProductEntity invProductEntity : invPreInProductList) {
+                //查询预验收库库存详情
-                    //查询库存码详情，如果库存码详情为空，则删除此库存
+//                FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
-                    FilterInvProductDetailRequest detailParams = new FilterInvProductDetailRequest();
+//                filterInvProductDetailRequest.setOrderIdFk(orderEntity.getId());
-                    detailParams.setBatchNo(invProductEntity.getBatchNo());
+//                List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
-                    detailParams.setInvCodes(Collections.singletonList(invProductEntity.getInvStorageCode()));
+//                List<InvProductEntity> invPreInProductList = new ArrayList<>();
-                    detailParams.setProductIdFk(invProductEntity.getRelIdFk());
+//                for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
-                    int count = invPreInProductDetailDao.statCount(detailParams);
+//                    FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
-                    if (count == 0) {
+//                    filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk());
-                        //如果库存码详情为空，则删除此库存
+//                    filterInvProductRequest.setSupId(invProductDetailEntity.getSupId());
-                        invPreInProductDao.deleteById(String.valueOf(invProductEntity.getId()));
+//                    filterInvProductRequest.setInvWarehouseCode(invProductDetailEntity.getInvWarehouseCode());
-                    } else {
+//                    filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode());
-                        invPreInProductDao.updateInvProduct(invProductEntity);
+//                    if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) {
-                    }
+//                        filterInvProductRequest.setBatchNo("empty");
-                }
+//                    } else {
+//                        filterInvProductRequest.setBatchNo(invProductDetailEntity.getBatchNo());
+//                    }
+//                    List<InvProductEntity> invProductEntities = invPreInProductDao.filterInvProduct(filterInvProductRequest);
+//                    if (CollUtil.isNotEmpty(invProductEntities) && invProductEntities.size() > 0) {
+//                        InvProductEntity invProductEntity = invProductEntities.get(0);
+//                        calculateInvCount(invProductEntity, invProductDetailEntity);
+//                        invPreInProductList.add(invProductEntity);
+//                    } else {
+//                        return false;
+//                    }
+//                }
+//                //删除库存详情
+//                invPreInProductDetailDao.deleteByOrderId(orderEntity.getId());
+//                //更新库存
+//                for (InvProductEntity invProductEntity : invPreInProductList) {
+//                    //查询库存码详情，如果库存码详情为空，则删除此库存
+//                    FilterInvProductDetailRequest detailParams = new FilterInvProductDetailRequest();
+//                    detailParams.setBatchNo(invProductEntity.getBatchNo());
+//                    detailParams.setInvCodes(Collections.singletonList(invProductEntity.getInvStorageCode()));
+//                    detailParams.setProductIdFk(invProductEntity.getRelIdFk());
+//                    int count = invPreInProductDetailDao.statCount(detailParams);
+//                    if (count == 0) {
+//                        //如果库存码详情为空，则删除此库存
+//                        invPreInProductDao.deleteById(String.valueOf(invProductEntity.getId()));
+//                    } else {
+//                        invPreInProductDao.updateInvProduct(invProductEntity);
+//                    }
+//                }
             } else {
                 //非预验收单据库存，正常扣减库存
                 FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();

api-admin/src/main/java/com/glxp/api/admin/service/inout/impl/OrderServiceImpl.java

@@ -524,8 +524,11 @@ public class OrderServiceImpl implements OrderService {
                 try {
                     //判断单据是否是预验收单据，如果是预验收单据，则删除预验收库库存
                     if (isPreInOrder(orderEntity)) {
+
+                        invPreInProductDetailDao.deleteByOrderId(orderEntity.getId());
+                        invPreInProductDao.deleteByOrderIdFk(orderEntity.getId());
                         //查询预验收库详情
-                        FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
+                      /*  FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
                         filterInvProductDetailRequest.setOrderIdFk(id);
                         List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
                         Map<String, List<InvProductDetailEntity>> invPreInProductDetailMap = invProductDetailEntities.stream().collect(Collectors.groupingBy(InvProductDetailEntity::getProductIdFk));
@@ -576,7 +579,7 @@ public class OrderServiceImpl implements OrderService {
                             } else {
                                 invPreInProductDao.updateInvProduct(invProductEntity);
                             }
-                        }
+                        }*/
                     } else {
                         //查询库存详情
                         FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();

api-admin/src/main/java/com/glxp/api/admin/thread/BasicBackUpdateProductService.java

@@ -8,6 +8,7 @@ import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
 import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.admin.httpclient.ErpBasicClient;
 import com.glxp.api.admin.req.basic.FilterErpGoodsRequest;
+import com.glxp.api.admin.req.basic.UdiInfoReqeust;
 import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.basic.ErpProductsResponse;
@@ -87,7 +88,7 @@ public class BasicBackUpdateProductService {
                     inventoryCodes.add(invmandocResponse.getCode());
                     erpProductsMap.put(invmandocResponse.getCode(), invmandocResponse);
                     if (isUpdate.getParamValue().equals("1")) {//不根据库存信息过滤
-                        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+                        UdiInfoReqeust udiInfoEntity = new UdiInfoReqeust();
                         udiInfoEntity.setNameCode(invmandocResponse.getCode());
                         udiInfoEntity.setCpmctymc(invmandocResponse.getName());
                         udiInfoEntity.setGgxh(invmandocResponse.getSpec());
@@ -214,7 +215,7 @@ public class BasicBackUpdateProductService {
                 if (udiRelevanceEntity == null) {
                     if (isUpdate.getParamValue().equals("1")) {
 
-                        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+                        UdiInfoReqeust udiInfoEntity = new UdiInfoReqeust();
                         udiInfoEntity.setNameCode(thrProductsEntity.getCode());
                         udiInfoEntity.setCpmctymc(thrProductsEntity.getName());
                         udiInfoEntity.setGgxh(thrProductsEntity.getSpec());

api-admin/src/main/java/com/glxp/api/admin/thread/BasicUdiInfoImportService.java

@@ -9,6 +9,8 @@ import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
 import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.admin.httpclient.UdiDlHttpClient;
 import com.glxp.api.admin.req.basic.FilterUdiIpLogRequest;
+import com.glxp.api.admin.req.basic.UdiInfoReqeust;
+import com.glxp.api.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.api.admin.service.basic.*;
@@ -120,7 +122,9 @@ public class BasicUdiInfoImportService {
                             udiInfoEntity.setManufactory(thrProductsEntity.getManufactory());
                             udiInfoEntity.setYlqxzcrbarmc(thrProductsEntity.getManufactory());
                             udiInfoEntity.setZczbhhzbapzbh(thrProductsEntity.getRegisterNo());
-                            udiInfoService.insertUdiInfo(udiInfoEntity);
+                            UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+                            BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+                            udiInfoService.insertUdiInfo(udiInfoRequest);
 
                         } else {
                             udiInfoImportDetailEntity.setStatus(BasicProcessStatus.UDIINFO_IMPORT_CODE_FAIL);
@@ -168,7 +172,9 @@ public class BasicUdiInfoImportService {
                             UdiRelevanceEntity temp = udiRelevanceService.selectUpteaByAll(udiInfoEntity.getUuid(), mainId);
                             if (temp != null) {
                                 updateValue(temp, udiInfoImportDetailEntity, udiInfoImportLogEntity, mainId);
-                                udiRelevanceService.updateUdiRelevance(temp);
+                                UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+                                BeanUtils.copyProperties(temp,udiRelevanceRequest);
+                                udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
                             } else {
                                 UdiRelevanceEntity mTemp = udiRelevanceService.selectUpdateByThirdId(mainId);
                                 boolean isThird = false;

api-admin/src/main/java/com/glxp/api/admin/thread/BasicUpdateProductService.java

@@ -9,6 +9,7 @@ import com.glxp.api.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.api.admin.httpclient.ErpInvClient;
 import com.glxp.api.admin.req.basic.CombineRequest;
 import com.glxp.api.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.api.admin.req.basic.UdiInfoReqeust;
 import com.glxp.api.admin.req.inventory.ErpOnhandRequest;
 import com.glxp.api.admin.req.thrsys.FilterThrInvProductsRequest;
 import com.glxp.api.admin.req.thrsys.FilterThrProductsRequest;
@@ -122,7 +123,9 @@ public class BasicUpdateProductService {
                         udiInfoEntity.setUuid(CustomUtil.getUUId());
                         udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
                         udiInfoEntity.setDiType(ConstantStatus.DI_TYPE_MAIN);
-                        udiInfoService.insertUdiInfo(udiInfoEntity);
+                        UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+                        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+                        udiInfoService.insertUdiInfo(udiInfoRequest);
                         udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
                         udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
                         String time = DateUtil.getDateTime();
@@ -171,7 +174,9 @@ public class BasicUpdateProductService {
         udiInfoEntity.setManufactory(erpProductsMap.get(onhandQueryResponse.getCode()).getManufactory());
         udiInfoEntity.setYlqxzcrbarmc(erpProductsMap.get(onhandQueryResponse.getCode()).getManufactory());
         udiInfoEntity.setZczbhhzbapzbh(erpProductsMap.get(onhandQueryResponse.getCode()).getRegisterNo());
-        udiInfoService.insertUdiInfo(udiInfoEntity);
+        UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+        udiInfoService.insertUdiInfo(udiInfoRequest);
         UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();
         udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
 

api-admin/src/main/java/com/glxp/api/admin/thread/DlBasicService.java

@@ -34,6 +34,7 @@ import com.glxp.api.admin.entity.purchase.SupProductEntity;
 import com.glxp.api.admin.entity.thrsys.*;
 import com.glxp.api.admin.httpclient.SpGetHttpClient;
 import com.glxp.api.admin.req.basic.BasicExportStatusRequest;
+import com.glxp.api.admin.req.basic.UdiInfoReqeust;
 import com.glxp.api.admin.res.basic.SpSyncUdiResponse;
 import com.glxp.api.admin.res.basic.SpsSyncBusResponse;
 import com.glxp.api.admin.res.basic.SpsSyncDataResponse;
@@ -229,7 +230,9 @@ public class DlBasicService {
                                 List<UdiInfoEntity> corpList = syncDataResponse.getUdiInfoEntities();
                                 UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
                                 for (UdiInfoEntity udiInfoEntity : corpList) {
-                                    mapper.insertUdiInfo(udiInfoEntity);
+                                    UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+                                    BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest);
+                                    mapper.insertUdiInfo(udiInfoRequest);
                                 }
                                 batchSession.commit();
                                 remark.append("耗材字典：").append(syncDataResponse.getUdiInfoEntities().size()).append("条\n");

api-admin/src/main/java/com/glxp/api/admin/util/DateUtil.java

@@ -543,4 +543,14 @@ public class DateUtil extends org.apache.commons.lang3.time.DateUtils {
         }
         return null;
     }
+    public static String formatExpireTime(String str) {
+        try {
+            Date date = DateUtil.parseDate(str, "yyyyMMdd");
+            return formatDate(date, "yyyy-MM-dd");
+        } catch (ParseException e) {
+            e.printStackTrace();
+        }
+        return str;
+    }
+
 }

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

@@ -127,7 +127,7 @@
                   nameCode = #{nameCode}) limit 1
     </select>
 
-    <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
+    <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.api.admin.req.basic.UdiInfoReqeust">
         replace
         INTO basic_products
         (id,
@@ -230,7 +230,7 @@
         WHERE uuid = #{uuid}
     </delete>
 
-    <update id="updateUdiInfo" parameterType="com.glxp.api.admin.entity.basic.UdiInfoEntity">
+    <update id="updateUdiInfo" parameterType="com.glxp.api.admin.req.basic.UdiInfoReqeust">
         UPDATE basic_products
         <trim prefix="set" suffixOverrides=",">
             <if test="packRatio != null">packRatio=#{packRatio},</if>

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

@@ -644,7 +644,7 @@
         WHERE uuid = #{uuid}
     </delete>
 
-    <update id="updateUdiRelevance" parameterType="com.glxp.api.admin.entity.basic.UdiRelevanceEntity">
+    <update id="updateUdiRelevance" parameterType="com.glxp.api.admin.req.basic.UdiRelevanceRequest">
         UPDATE basic_udirel
         <trim prefix="set" suffixOverrides=",">
             <if test="thirdId != null">

api-admin/src/main/resources/mybatis/mapper/inout/OrderDao.xml

@@ -671,4 +671,15 @@
         </trim>
         where id = #{id}
     </update>
+
+    <select id="selectByBillNoAndStatus" resultType="com.glxp.api.admin.entity.inout.OrderEntity">
+        select io_order.*, auth_dept.name deptName
+        from io_order
+        left join auth_dept on io_order.deptCode = auth_dept.code
+        where io_order.status = 4
+        and (io_order.id = #{billNo} or io_order.erpFk = #{billNo})
+        <if test="contrastStatus!=null">
+            and contrastStatus=#{contrastStatus}
+        </if>
+    </select>
 </mapper>