代码备份

src/main/java/com/glxp/api/controller/basic/UdiRlSupController.java

@@ -185,7 +185,6 @@ public class UdiRlSupController extends BaseController {
     @AuthRuleAnnotation("")
     @GetMapping("/sale/info/getCompanyProductRelevance")
     public BaseResponse getCompanyProductRelevance(FilterCompanyProductRelevanceRequest filterCompanyProductRelevanceRequest) {
-//        filterCompanyProductRelevanceRequest.setCustomerId(getCustomerId());
         List<UdiRlSupEntity> companyProductRelevanceEntities = udiRlSupService.getCompanyProductRelevance(filterCompanyProductRelevanceRequest);
         PageInfo<UdiRlSupEntity> pageInfo = new PageInfo<>(companyProductRelevanceEntities);
         PageSimpleResponse<UdiRlSupEntity> pageSimpleResponse = new PageSimpleResponse<>();

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

@@ -761,8 +761,6 @@ public class IoCodeTempController extends BaseController {
                 orderEntity.setBusType(bussinessTypeEntity.getBusType());
                 orderService.insertOrder(orderEntity);
             }
-
-
             if (addOrderRequest.getOrderType() == ConstantStatus.ORDER_TYPE_NORMAL && bussinessTypeEntity.isCheckEnable() && bussinessTypeEntity.getCheckWebNew() != 0) {
                 boolean isBillExit = orderDetailBizService.isExit(orderEntity.getBillNo());
                 if (!isBillExit) {
@@ -770,8 +768,25 @@ public class IoCodeTempController extends BaseController {
                     return ResultVOUtils.error(500, "请先录入业务详情");
                 }
             }
-
             BaseResponse baseResponse = checkRelId(codeEnttity, unitFk);
+            BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity);
+            if (invRes != null) {
+                return invRes;
+            }
+            genDetaiEntity = codeEnttity;
+            if (baseResponse == null) {
+                baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
+                if (baseResponse != null)
+                    return baseResponse;
+            } else {
+                if (baseResponse.getCode() == 501) {
+                    return baseResponse;
+                } else if (baseResponse.getCode() == 502) {
+                    return baseResponse;
+                }
+                checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
+                return baseResponse;
+            }
 
             if (bussinessTypeEntity.getCheckCertExpire() == 2 && udiRelevanceResponse.isNeedCert()) {
                 SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory());
@@ -791,27 +806,7 @@ public class IoCodeTempController extends BaseController {
                     } else {
                         return ResultVOUtils.error(500, "产品资质证书未通过审核！");
                     }
-
-                }
-            }
-
-            BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity);
-            if (invRes != null) {
-                return invRes;
-            }
-            genDetaiEntity = codeEnttity;
-            if (baseResponse == null) {
-                baseResponse = checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
-                if (baseResponse != null)
-                    return baseResponse;
-            } else {
-                if (baseResponse.getCode() == 501) {
-                    return baseResponse;
-                } else if (baseResponse.getCode() == 502) {
-                    return baseResponse;
                 }
-                checkSupId(bussinessTypeEntity, codeEnttity, unitFk);
-                return baseResponse;
             }
 
             //是否边扫边校验
@@ -1208,9 +1203,9 @@ public class IoCodeTempController extends BaseController {
     @PostMapping("warehouse/inout/checkTempCode")
     public BaseResponse checkTempCode(@RequestBody IoCodeTempEntity codeTempEntity) {
 
-        Boolean falg=codeTempService.checkTempCode(codeTempEntity);
+        Boolean falg = codeTempService.checkTempCode(codeTempEntity);
-        if(!falg){
+        if (!falg) {
-            return ResultVOUtils.error(999,"该产品已存在，请勿重复录入");
+            return ResultVOUtils.error(999, "该产品已存在，请勿重复录入");
         }
 
         return ResultVOUtils.success();

src/main/java/com/glxp/api/controller/purchase/PurApplyController.java

@@ -68,11 +68,6 @@ public class PurApplyController {
     CustomerService customerService;
     @Resource
     GennerOrderUtils gennerOrderUtils;
-    @Resource
-    UdiRelevanceService udiRelevanceService;
-    @Resource
-    UdiRlSupService udiRlSupService;
-    @Resource
     IBasicBussinessTypeService basicBussinessTypeService;
 
     /**

src/main/java/com/glxp/api/service/basic/CompanyProductsRelService.java

@@ -19,8 +19,6 @@ import java.util.List;
 
 @Service
 public class CompanyProductsRelService {
-    @Resource
-    private UdiRlSupService udiRlSupService;
     @Resource
     UdiRelevanceService udiRelevanceService;
     @Resource
@@ -57,43 +55,8 @@ public class CompanyProductsRelService {
                     }
                     companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId() + "");
                     boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
-
-
                 }
-
-            } else {//一键导出  //todo暂时去掉
-//            FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
-//            BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest);
-//            filterUdiInfoRequest.setPage(null);
-//            List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
-//            for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
-//                CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
-//                companyProductRelevanceEntity.setCreate_time(new Date());
-//                companyProductRelevanceEntity.setUpdate_time(new Date());
-//                companyProductRelevanceEntity.setAuditStatus("3");
-//                companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
-//                companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceResponse.getId());
-//                companyProductRelevanceEntity.setProductUuid(udiRelevanceResponse.getUuid());
-//                companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId());
-//                boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
-//            }
             }
-        } else {//一键导出  //todo暂时去掉
-//            FilterUdiInfoRequest filterUdiInfoRequest = new FilterUdiInfoRequest();
-//            BeanUtils.copyProperties(udiInfoExportRequest, filterUdiInfoRequest);
-//            filterUdiInfoRequest.setPage(null);
-//            List<UdiRelevanceResponse> udiRelevanceResponses = udiRelevanceService.filterUdiRelevance(filterUdiInfoRequest);
-//            for (UdiRelevanceResponse udiRelevanceResponse : udiRelevanceResponses) {
-//                CompanyProductRelevanceEntity companyProductRelevanceEntity = new CompanyProductRelevanceEntity();
-//                companyProductRelevanceEntity.setCreate_time(new Date());
-//                companyProductRelevanceEntity.setUpdate_time(new Date());
-//                companyProductRelevanceEntity.setAuditStatus("3");
-//                companyProductRelevanceEntity.setUnitFk(udiInfoExportRequest.getUnitFk());
-//                companyProductRelevanceEntity.setUdiRlIdFk(udiRelevanceResponse.getId());
-//                companyProductRelevanceEntity.setProductUuid(udiRelevanceResponse.getUuid());
-//                companyProductRelevanceEntity.setCustomerId(udiInfoExportRequest.getCustomerId());
-//                boolean b = companyProductRelevanceService.insertCompanyProductRelevance(companyProductRelevanceEntity);
-//            }
         }
     }
 

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

@@ -1038,7 +1038,7 @@
                  isLock,
                  lockStatus, isAdavence, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
                  updateUser,
-                 remark, useExpireTime, dispatch, groupBuy，needCert)
+                 remark, useExpireTime, dispatch, groupBuy,needCert)
                 values
 
         <foreach collection="udiRelevanceEntities" item="item" index="index" separator=",">
@@ -1064,7 +1064,7 @@
              #{item.modifyTime},
              #{item.createUser},
              #{item.updateUser},
-             #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy}，#{item.needCert})
+             #{item.remark}, #{item.useExpireTime}, #{item.dispatch}, #{item.groupBuy},#{item.needCert})
         </foreach>
     </insert>
 

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

@@ -46,13 +46,10 @@
                basic_udirel.lockStatus,
                basic_udirel.mainId,
                basic_udirel.isAdavence,
-
                basic_udirel.lowStockNum,
                basic_udirel.overStockNum,
                basic_udirel.recentDateTime,
                basic_udirel.isDateBy,
-
-
                bht.name             classifyName,
                basic_products.id as PRId,
                basic_products.originUuid,