优化bug问题

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

@@ -48,6 +48,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
 import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Date;
@@ -214,7 +215,9 @@ public class SpsSyncUploadController {
                 List<UdiInfoEntity> udiInfoEntities = syncDataResponse.getUdiInfoEntities();
                 UdiInfoDao mapper = batchSession.getMapper(UdiInfoDao.class);
                 for (UdiInfoEntity udiInfoEntity : udiInfoEntities) {
-                    mapper.insertUdiInfo(udiInfoEntity);
+                    UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+                    BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest);
+                    mapper.insertUdiInfo(udiInfoRequest);
                 }
                 batchSession.commit();
             }

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

@@ -14,6 +14,8 @@ import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.req.basic.CombineRequest;
 import com.glxp.sale.admin.req.basic.RemoveRelRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
+import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.sale.admin.req.receipt.ProductInfoFilterRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
@@ -162,7 +164,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("切换成功！");
     }
 
@@ -188,7 +192,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, "已存在相同的对照关系,对照失败!");
             }
@@ -240,7 +246,9 @@ public class UdiContrastController {
             udiRelevanceEntity.setPrice("");
             udiRelevanceEntity.setManufactory("");
             udiRelevanceEntity.setMeasname("");
-            udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+            UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+            BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+            udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
         } catch (Exception e) {
             e.printStackTrace();
             return ResultVOUtils.error(500, "解除绑定失败！");
@@ -354,7 +362,9 @@ public class UdiContrastController {
         udiInfoEntity.setScbssfbhsxrq("是");
         udiInfoEntity.setScbssfbhxlh("否");
         udiInfoEntity = UdiInfoUtil.initUdiInfoEntity(udiInfoEntity);
-        udiInfoService.insertUdiInfo(udiInfoEntity);
+        UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+        udiInfoService.insertUdiInfo(udiInfoRequest);
     }
 
     public void updateDi(UdiRelevanceEntity udiRelevanceEntity, String key) {
@@ -364,7 +374,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/sale/admin/controller/basic/UdiRelevanceController.java

@@ -290,7 +290,9 @@ public class UdiRelevanceController {
         if (udiRelevanceResponse.getIsUseDy() == 1) {
             udiRelevanceEntity.setIsUseDy(true);
         } else udiRelevanceEntity.setIsUseDy(false);
-        udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+        UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+        BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+        udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
 
         if (!customerId.equals("110")) {
             if (StrUtil.isNotEmpty(udiRelevanceEntity.getPrice())) {
@@ -300,8 +302,29 @@ public class UdiRelevanceController {
             }
         }
 
-        UdiInfoEntity udiInfoEntity = new UdiInfoEntity();
+
-        BeanUtils.copyProperties(udiRelevanceResponse, udiInfoEntity);
+
+        UdiInfoReqeust udiInfoEntity = new UdiInfoReqeust();
+        udiInfoEntity.setSptm(udiRelevanceResponse.getSptm());
+        udiInfoEntity.setYbbm(udiRelevanceResponse.getYbbm());
+        udiInfoEntity.setMeasname(udiRelevanceResponse.getMeasname());
+        udiInfoEntity.setManufactory(udiRelevanceResponse.getManufactory());
+        udiInfoEntity.setCpms(udiRelevanceResponse.getCpms());
+        udiInfoEntity.setPrice(udiRelevanceResponse.getPrice());
+        udiInfoEntity.setSpmc(udiRelevanceResponse.getSpmc());
+        udiInfoEntity.setBasicPrductRemak1(udiRelevanceResponse.getBasicPrductRemak1());
+        udiInfoEntity.setBasicPrductRemak2(udiRelevanceResponse.getBasicPrductRemak2());
+        udiInfoEntity.setBasicPrductRemak3(udiRelevanceResponse.getBasicPrductRemak3());
+        udiInfoEntity.setBasicPrductRemak4(udiRelevanceResponse.getBasicPrductRemak4());
+        udiInfoEntity.setBasicPrductRemak5(udiRelevanceResponse.getBasicPrductRemak5());
+        udiInfoEntity.setBasicPrductRemak6(udiRelevanceResponse.getBasicPrductRemak6());
+        udiInfoEntity.setBasicPrductRemak7(udiRelevanceResponse.getBasicPrductRemak7());
+        udiInfoEntity.setBasicPrductRemak8(udiRelevanceResponse.getBasicPrductRemak8());
+        if (StrUtil.isNotEmpty(udiRelevanceResponse.getOriginUuid())) {
+            udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_UDI);
+        }
+
+        udiInfoEntity.setUuid(udiRelevanceResponse.getUuid());
         udiInfoService.updateUdiInfo(udiInfoEntity);
         return ResultVOUtils.success("更新成功");
     }
@@ -480,12 +503,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);
             }
@@ -665,23 +688,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("解除绑定成功！");
     }
 
@@ -701,7 +726,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/sale/admin/controller/inout/StockOrderController.java

@@ -624,7 +624,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);
         }
@@ -636,7 +636,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();
         }
@@ -646,11 +646,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/sale/admin/controller/thrsys/ThrProductsAddController.java

@@ -8,6 +8,7 @@ import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsAddEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
+import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
@@ -125,7 +126,9 @@ public class ThrProductsAddController {
                 String time = DateUtil.formatDateTime(new Date());
                 udiRelevanceEntity.setUpdateTime(time);
                 udiRelevanceEntity.setModifyTime(time);
-                udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+                UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+                org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+                udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
             }
 
 

api-admin/src/main/java/com/glxp/sale/admin/controller/thrsys/ThrProductsAddDiController.java

@@ -13,9 +13,7 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsAddDiEntity;
 import com.glxp.sale.admin.exception.JsonException;
-import com.glxp.sale.admin.req.basic.CombineRequest;
+import com.glxp.sale.admin.req.basic.*;
-import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
-import com.glxp.sale.admin.req.basic.SupplementRequest;
 import com.glxp.sale.admin.req.inout.DeleteRequest;
 import com.glxp.sale.admin.req.thrsys.AddThrDiProductsRequest;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
@@ -186,25 +184,27 @@ public class ThrProductsAddDiController {
                 udiRelevanceEntity.setManufactory(thrProductsAddDiEntity.getManufactory());
 
                 UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid());
-                udiInfoEntity.setSptm(thrProductsAddDiResponse.getSptm());
+                UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
-                udiInfoEntity.setYbbm(thrProductsAddDiResponse.getYbbm());
+                BeanUtils.copyProperties(udiInfoEntity,udiInfoRequest);
-                udiInfoEntity.setMeasname(thrProductsAddDiResponse.getMeasname());
+                udiInfoRequest.setSptm(thrProductsAddDiResponse.getSptm());
-                udiInfoEntity.setManufactory(thrProductsAddDiResponse.getManufactory());
+                udiInfoRequest.setYbbm(thrProductsAddDiResponse.getYbbm());
-                udiInfoEntity.setSpmc(thrProductsAddDiResponse.getSpmc());
+                udiInfoRequest.setMeasname(thrProductsAddDiResponse.getMeasname());
-                udiInfoEntity.setCpms(thrProductsAddDiResponse.getCpms());
+                udiInfoRequest.setManufactory(thrProductsAddDiResponse.getManufactory());
-                udiInfoEntity.setPrice(thrProductsAddDiResponse.getPrice());
+                udiInfoRequest.setSpmc(thrProductsAddDiResponse.getSpmc());
-                udiInfoEntity.setBasicPrductRemak1(thrProductsAddDiResponse.getBasicPrductRemak1());
+                udiInfoRequest.setCpms(thrProductsAddDiResponse.getCpms());
-                udiInfoEntity.setBasicPrductRemak2(thrProductsAddDiResponse.getBasicPrductRemak2());
+                udiInfoRequest.setPrice(thrProductsAddDiResponse.getPrice());
-                udiInfoEntity.setBasicPrductRemak3(thrProductsAddDiResponse.getBasicPrductRemak3());
+                udiInfoRequest.setBasicPrductRemak1(thrProductsAddDiResponse.getBasicPrductRemak1());
-                udiInfoEntity.setBasicPrductRemak4(thrProductsAddDiResponse.getBasicPrductRemak4());
+                udiInfoRequest.setBasicPrductRemak2(thrProductsAddDiResponse.getBasicPrductRemak2());
-                udiInfoEntity.setBasicPrductRemak5(thrProductsAddDiResponse.getBasicPrductRemak5());
+                udiInfoRequest.setBasicPrductRemak3(thrProductsAddDiResponse.getBasicPrductRemak3());
-                udiInfoEntity.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6());
+                udiInfoRequest.setBasicPrductRemak4(thrProductsAddDiResponse.getBasicPrductRemak4());
-                udiInfoEntity.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
+                udiInfoRequest.setBasicPrductRemak5(thrProductsAddDiResponse.getBasicPrductRemak5());
-                udiInfoEntity.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
+                udiInfoRequest.setBasicPrductRemak6(thrProductsAddDiResponse.getBasicPrductRemak6());
-                udiInfoService.updateUdiInfo(udiInfoEntity);
+                udiInfoRequest.setBasicPrductRemak7(thrProductsAddDiResponse.getBasicPrductRemak7());
-
+                udiInfoRequest.setBasicPrductRemak8(thrProductsAddDiResponse.getBasicPrductRemak8());
-
+                udiInfoService.updateUdiInfo(udiInfoRequest);
-                udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+                UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
+                org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+                udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
 //                udiInfoService.updateUdiInfo(udiInfoEntity);
                 //回填关联关系到关联表
                 CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();

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

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

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

@@ -2,6 +2,7 @@ package com.glxp.sale.admin.dao.basic;
 
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -36,7 +37,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/sale/admin/dao/inout/OrderDao.java

@@ -97,4 +97,12 @@ 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/sale/admin/req/basic/FilterUdiInfoRequest.java

@@ -59,5 +59,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/sale/admin/req/basic/UdiInfoReqeust.java

@@ -0,0 +1,86 @@
+package com.glxp.sale.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/sale/admin/req/basic/UdiRelevanceRequest.java

@@ -0,0 +1,42 @@
+package com.glxp.sale.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/sale/admin/service/basic/UdiContrastService.java

@@ -11,6 +11,7 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.req.basic.CombineRequest;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.service.thrsys.ThrProductsService;
 import com.glxp.sale.admin.thread.UdiDlHttpClient;
@@ -171,7 +172,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);
     }
 
     public long createOnlyUuid(CombineRequest combineRequest, String key) {

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

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

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

@@ -3,6 +3,7 @@ package com.glxp.sale.admin.service.basic;
 
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import org.apache.ibatis.annotations.Param;
 
@@ -54,7 +55,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/sale/admin/service/basic/impl/UdiInfoImportDetailServiceImpl.java

@@ -11,12 +11,14 @@ import com.glxp.sale.admin.entity.basic.UdiInfoImportDetailEntity;
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
 import com.glxp.sale.admin.res.basic.UdiRelevanceExportJsonResponse;
 import com.glxp.sale.admin.service.basic.UdiInfoImportDetailService;
 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.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -100,7 +102,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/sale/admin/service/basic/impl/UdiInfoServiceImpl.java

@@ -1,11 +1,13 @@
 package com.glxp.sale.admin.service.basic.impl;
 
 import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageHelper;
 import com.glxp.sale.admin.dao.basic.UdiInfoDao;
 import com.glxp.sale.admin.entity.basic.UdiInfoEntity;
 import com.glxp.sale.admin.entity.receipt.ProductInfoEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.service.basic.UdiInfoService;
 import com.glxp.sale.admin.util.FilterUdiUtils;
@@ -91,8 +93,8 @@ public class UdiInfoServiceImpl implements UdiInfoService {
     }
 
     @Override
-    public boolean insertUdiInfo(UdiInfoEntity udiInfoEntity) {
+    public boolean insertUdiInfo(UdiInfoReqeust udiInfoRequest) {
-        return udiInfoDao.insertUdiInfo(udiInfoEntity);
+        return udiInfoDao.insertUdiInfo(udiInfoRequest);
     }
 
     @Override
@@ -101,8 +103,10 @@ public class UdiInfoServiceImpl implements UdiInfoService {
     }
 
     @Override
-    public boolean updateUdiInfo(UdiInfoEntity udiInfoEntity) {
+    public boolean updateUdiInfo(UdiInfoReqeust udiInfoRequest) {
-        return udiInfoDao.updateUdiInfo(udiInfoEntity);
+        if (StrUtil.isEmpty(udiInfoRequest.getUuid()))
+            return false;
+        return udiInfoDao.updateUdiInfo(udiInfoRequest);
     }
 
     @Override

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

@@ -7,6 +7,7 @@ import com.glxp.sale.admin.dao.basic.UdiRelevanceDao;
 import com.glxp.sale.admin.entity.basic.BasicThirdSysEntity;
 import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
+import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.service.basic.BasicThirdSysService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
@@ -268,26 +269,26 @@ 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());
         }
-        return udiRelevanceDao.updateUdiRelevance(udiRelevanceEntity);
+        return udiRelevanceDao.updateUdiRelevance(udiRelevanceRequest);
     }
 
     @Override

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

@@ -45,5 +45,5 @@ public interface StockOrderService {
      */
     List<StockOrderEntity> getSupplementOrderBillNoList();
 
-    boolean rollbackOrder(String billNo);
+    boolean rollbackOrder(String billNo,Integer contrastStatus);
 }

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

@@ -175,11 +175,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)) {
             //回退未验收单据

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

@@ -10,6 +10,7 @@ import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.httpclient.ErpBasicClient;
 import com.glxp.sale.admin.req.basic.FilterErpGoodsRequest;
 import com.glxp.sale.admin.req.basic.SpsSyncDataRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.*;
@@ -89,7 +90,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());
@@ -191,7 +192,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/sale/admin/thread/BasicUdiInfoImportService.java

@@ -8,6 +8,8 @@ import com.glxp.sale.admin.entity.basic.*;
 import com.glxp.sale.admin.entity.param.SystemParamConfigEntity;
 import com.glxp.sale.admin.entity.thrsys.ThrProductsEntity;
 import com.glxp.sale.admin.req.basic.FilterUdiIpLogRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
+import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.sale.admin.service.basic.*;
@@ -112,7 +114,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);
@@ -160,7 +164,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);
                                 if (mTemp != null) {

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

@@ -13,6 +13,7 @@ import com.glxp.sale.admin.httpclient.ErpBasicClient;
 import com.glxp.sale.admin.req.basic.CombineRequest;
 import com.glxp.sale.admin.req.basic.FilterUdiInfoRequest;
 import com.glxp.sale.admin.req.basic.UdiInfoExportRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
 import com.glxp.sale.admin.req.thrsys.FilterThrProductsRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
 import com.glxp.sale.admin.res.basic.ErpProductsResponse;
@@ -92,7 +93,9 @@ public class BasicUpdateProductService {
                         udiInfoEntity.setUuid(CustomUtil.getUUId());
                         udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
                         udiInfoEntity.setDiType(1);
-                        udiInfoService.insertUdiInfo(udiInfoEntity);
+                        UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+                        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+                        udiInfoService.insertUdiInfo(udiInfoRequest);
                     }
                     udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
                     udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());
@@ -168,7 +171,9 @@ public class BasicUpdateProductService {
                         udiInfoEntity.setUuid(CustomUtil.getUUId());
                         udiInfoEntity.setProductType(ConstantStatus.PRODUCT_TYPE_THIRD);
                         udiInfoEntity.setDiType(1);
-                        udiInfoService.insertUdiInfo(udiInfoEntity);
+                        UdiInfoReqeust udiInfoRequest=new UdiInfoReqeust();
+                        BeanUtils.copyProperties(udiInfoEntity, udiInfoRequest);
+                        udiInfoService.insertUdiInfo(udiInfoRequest);
                     }
                     udiRelevanceEntity1.setUuid(udiInfoEntity.getUuid());
                     udiRelevanceEntity1.setThirdName(thrProductsEntity.getName());

api-admin/src/main/java/com/glxp/sale/admin/thread/CompanyProductsRelService.java

@@ -6,6 +6,8 @@ import com.glxp.sale.admin.entity.basic.UdiRelevanceEntity;
 import com.glxp.sale.admin.entity.info.CompanyProductRelevanceEntity;
 import com.glxp.sale.admin.req.basic.SupplementRequest;
 import com.glxp.sale.admin.req.basic.UdiInfoExportRequest;
+import com.glxp.sale.admin.req.basic.UdiInfoReqeust;
+import com.glxp.sale.admin.req.basic.UdiRelevanceRequest;
 import com.glxp.sale.admin.service.basic.UdiInfoService;
 import com.glxp.sale.admin.service.basic.UdiRelevanceService;
 import com.glxp.sale.admin.service.info.CompanyProductRelevanceService;
@@ -40,12 +42,15 @@ public class CompanyProductsRelService {
                     if (udiRelevanceEntity != null && StrUtil.isNotBlank(udiRelevanceEntity.getPrice())) {
                         companyProductRelevanceEntity.setPrice(new BigDecimal(udiRelevanceEntity.getPrice()));
                     }
-                    UdiInfoEntity udiInfoEntity = udiInfoService.findByUuid(udiRelevanceEntity.getUuid());
+                    UdiInfoReqeust udiInfoRequest = new UdiInfoReqeust();
+                    udiInfoRequest.setUuid(udiRelevanceEntity.getUuid());
                     SupplementRequest supplementRequest = udiInfoExportRequest.getSupplementRequest();
-                    BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoEntity);
+                    BeanUtils.copyProperties(udiInfoExportRequest.getSupplementRequest(), udiInfoRequest);
                     BeanUtils.copyProperties(supplementRequest, udiRelevanceEntity);
-                    udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
+                    UdiRelevanceRequest udiRelevanceRequest=new UdiRelevanceRequest();
-                    udiInfoService.updateUdiInfo(udiInfoEntity);
+                    org.springframework.beans.BeanUtils.copyProperties(udiRelevanceEntity,udiRelevanceRequest);
+                    udiRelevanceService.updateUdiRelevance(udiRelevanceRequest);
+                    udiInfoService.updateUdiInfo(udiInfoRequest);
                     companyProductRelevanceEntity.setCreate_time(new Date());
                     companyProductRelevanceEntity.setUpdate_time(new Date());
                     companyProductRelevanceEntity.setAuditStatus("3");

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.sale.admin.entity.basic.UdiInfoEntity">
+    <insert id="insertUdiInfo" keyProperty="id" parameterType="com.glxp.sale.admin.req.basic.UdiInfoReqeust">
         replace
         INTO basic_products
         (id,
@@ -232,7 +232,7 @@
         WHERE uuid = #{uuid}
     </delete>
 
-    <update id="updateUdiInfo" parameterType="com.glxp.sale.admin.entity.basic.UdiInfoEntity">
+    <update id="updateUdiInfo" parameterType="com.glxp.sale.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

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

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

@@ -668,4 +668,16 @@
         </trim>
         where id = #{id}
     </update>
+
+    <select id="selectByBillNoAndStatus" resultType="com.glxp.sale.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>