1.部分接口添加数据重复校验

2.修复部分sql模糊查询写法错误导致无数据问题

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

@@ -119,7 +119,7 @@ public class BasicUnitMaintainController {
 
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/basic/unit/maintain/save")
-    public BaseResponse save(@RequestBody BasicUnitMaintainEntity basicUnitMaintainSaveRequest,
+    public BaseResponse save(@RequestBody @Valid BasicUnitMaintainEntity basicUnitMaintainSaveRequest,
                              BindingResult bindingResult) {
 
         if (bindingResult.hasErrors()) {

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

@@ -97,6 +97,11 @@ public class BussinessOriginTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         if (bussinessTypeEntity != null) {
+            //校验单据类型代码是否重复
+            boolean exists = bussinessOriginTypeService.checkActionExists(bussinessTypeEntity.getAction(), bussinessTypeEntity.getThirdSys());
+            if (exists) {
+                return ResultVOUtils.error(500, "单据类型已存在！");
+            }
             bussinessOriginTypeService.updateBusOriginType(bussinessTypeEntity);
         } else {
             ResultVOUtils.error(999, "参数错误");
@@ -112,9 +117,12 @@ public class BussinessOriginTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         if (bussinessTypeEntity != null) {
-            bussinessTypeEntity.setUpdateTime(new Date());
-
+            boolean exists = bussinessOriginTypeService.checkActionExists(bussinessTypeEntity.getAction(), bussinessTypeEntity.getThirdSys());
+            if (exists) {
+                return ResultVOUtils.error(500, "单据类型已存在！");
+            }
 
+            bussinessTypeEntity.setUpdateTime(new Date());
             BussinessOriginTypeEntity bussinessOriginTypeEntity = bussinessOriginTypeService.findByAction(bussinessTypeEntity.getAction());
             if (bussinessOriginTypeEntity != null) {
                 return ResultVOUtils.error(500, "单据类型已存在！");

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

@@ -22,6 +22,7 @@ import com.glxp.api.admin.util.FilterUdiUtils;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -33,6 +34,7 @@ import javax.annotation.Resource;
 import java.util.*;
 
 //基础信息维护
+@Slf4j
 @RestController
 public class UdiInfoController {
 
@@ -53,9 +55,7 @@ public class UdiInfoController {
     @AuthRuleAnnotation("")
     @GetMapping("udiwms/udiinfo/filterUdi")
     public BaseResponse filterUdi(FilterUdiInfoRequest filterUdiInfoRequest) {
-        Map<String, Object> paramMap = new HashMap<>(16);
-
-        String nameCode = null;
+        String nameCode;
         if (filterUdiInfoRequest.getUdiCode() != null && !filterUdiInfoRequest.getUdiCode().equals("")) {
             UdiEntity udiEntity = FilterUdiUtils.getUdi(filterUdiInfoRequest.getUdiCode());
             if (udiEntity != null) {
@@ -100,10 +100,9 @@ public class UdiInfoController {
                     }
                 }
             }
-
             return udiDlDeviceResponse;
         } catch (Exception e) {
-            e.printStackTrace();
+            log.error(e.getMessage(), e);
             return ResultVOUtils.error(500, "连接UDI数据下载服务出错！");
         }
     }

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

@@ -4,7 +4,6 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.pagehelper.PageInfo;
 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.entity.auth.AuthAdmin;
 import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
@@ -13,7 +12,6 @@ import com.glxp.api.admin.entity.basic.UdiInfoEntity;
 import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
 import com.glxp.api.admin.entity.business.StockOrderEntity;
 import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
-import com.glxp.api.admin.entity.inout.ErpOrderEntity;
 import com.glxp.api.admin.entity.inout.WarehouseEntity;
 import com.glxp.api.admin.exception.JsonException;
 import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest;
@@ -30,17 +28,14 @@ import com.glxp.api.admin.res.business.StockOrderDetailResponse;
 import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse;
 import com.glxp.api.admin.service.auth.AuthAdminService;
 import com.glxp.api.admin.service.basic.BussinessLocalTypeService;
-import com.glxp.api.admin.service.basic.BussinessTypeService;
 import com.glxp.api.admin.service.basic.UdiInfoService;
 import com.glxp.api.admin.service.basic.UdiRelevanceService;
 import com.glxp.api.admin.service.business.StockOrderDetailService;
 import com.glxp.api.admin.service.business.StockOrderDetailTempService;
 import com.glxp.api.admin.service.business.StockOrderService;
-import com.glxp.api.admin.service.business.StockQRCodeTextService;
 import com.glxp.api.admin.service.info.CompanyProductRelevanceService;
 import com.glxp.api.admin.service.info.SystemParamConfigService;
 import com.glxp.api.admin.service.inout.CodesService;
-import com.glxp.api.admin.thread.IoTransInoutService;
 import com.glxp.api.admin.util.FilterUdiUtils;
 import com.glxp.api.common.enums.ResultEnum;
 import com.glxp.api.common.res.BaseResponse;
@@ -58,7 +53,6 @@ import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 
 @RestController
@@ -619,7 +613,7 @@ public class StockOrderDetailController {
     @PostMapping("/udiwms/stock/order/detail/update")
     public BaseResponse updateStockOrderDetail(@RequestBody StockOrderDetailEntity stockOrderDetailEntity) {
         if (null != stockOrderDetailEntity)
-            stockOrderDetailService.updateById(stockOrderDetailEntity);
+            stockOrderDetailService.updateOrderDetailInfo(stockOrderDetailEntity);
         return ResultVOUtils.success("更新成功");
     }
 }

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

@@ -30,4 +30,11 @@ public interface BussinessOriginTypeDao {
      * @return
      */
     String selectNameByAction(@Param("action") String action);
+
+    /**
+     * 根据单据类型统计条数
+     * @param action
+     * @return
+     */
+    int countByAction(@Param("action") String action, @Param("thirdSys") String thirdSys);
 }

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

@@ -46,4 +46,12 @@ public interface BussinessOriginTypeService {
      * @return
      */
     String findNameByAction(String originAction);
+
+    /**
+     * 校验单据类型代码是否重复
+     * @param action
+     * @param thirdSys
+     * @return
+     */
+    boolean checkActionExists(String action, String thirdSys);
 }

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

@@ -136,4 +136,13 @@ public class BussinessOriginTypeServiceImpl implements BussinessOriginTypeServic
     public String findNameByAction(String originAction) {
         return bussinessOriginTypeDao.selectNameByAction(originAction);
     }
+
+    @Override
+    public boolean checkActionExists(String action, String thirdSys) {
+        int count = bussinessOriginTypeDao.countByAction(action, thirdSys);
+        if (count > 0) {
+            return true;
+        }
+        return false;
+    }
 }

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

@@ -27,5 +27,11 @@ public interface StockOrderDetailService {
 
     boolean verifyCount(List<StockOrderDetailEntity> subErpOrders);
 
+    /**
+     * 更新业务单据详情信息
+     *
+     * @param stockOrderDetailEntity
+     */
+    void updateOrderDetailInfo(StockOrderDetailEntity stockOrderDetailEntity);
 
 }

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

@@ -95,4 +95,23 @@ public class StockOrderDetailServiceImpl implements StockOrderDetailService {
         return true;
     }
 
+    @Override
+    public void updateOrderDetailInfo(StockOrderDetailEntity stockOrderDetailEntity) {
+        if (null != stockOrderDetailEntity) {
+            if (StrUtil.isBlank(stockOrderDetailEntity.getInvoiceDate())) {
+                stockOrderDetailEntity.setInvoiceDate("");
+            }
+            if (StrUtil.isBlank(stockOrderDetailEntity.getFirstSalesInvNo())) {
+                stockOrderDetailEntity.setFirstSalesInvNo("");
+            }
+            if (StrUtil.isBlank(stockOrderDetailEntity.getSecSalesInvNo())) {
+                stockOrderDetailEntity.setSecSalesInvNo("");
+            }
+            if (StrUtil.isBlank(stockOrderDetailEntity.getSecSalesListNo())) {
+                stockOrderDetailEntity.setSecSalesListNo("");
+            }
+            stockOrderDetailDao.updateById(stockOrderDetailEntity);
+        }
+    }
+
 }

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

@@ -81,6 +81,10 @@
         select name from basic_bustype_origin where action = #{action}
     </select>
 
+    <select id="countByAction" resultType="java.lang.Integer">
+        select count(*) from basic_bustype_origin where action = #{action} and thirdSys = #{thirdSys}
+    </select>
+
     <insert id="insertBusOriginType" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.basic.BussinessOriginTypeEntity">
         replace

api-admin/src/main/resources/mybatis/mapper/inventory/InvPreInProductDao.xml

@@ -148,7 +148,7 @@
             </if>
 
             <if test="ggxh != '' and ggxh != null">
-                AND basic_products.ggxh = concat('%',#{ggxh},'%')
+                AND basic_products.ggxh like concat('%',#{ggxh},'%')
             </if>
             <if test="batchNo != '' and batchNo != null">
                 AND inv_prein_product.batchNo like concat('%',#{batchNo},'%')

api-admin/src/main/resources/mybatis/mapper/inventory/InvProductDao.xml

@@ -134,7 +134,7 @@
                 AND inv_product.productsName like concat('%',#{productsName},'%')
             </if>
             <if test="nameCode != '' and nameCode != null">
-                AND inv_product.nameCode like concat('%', #{nameCode}, '%')
+                AND basic_products.nameCode like concat('%', #{nameCode}, '%')
             </if>
             <if test="relIdFk != '' and relIdFk != null">
                 AND inv_product.relIdFk = #{relIdFk}
@@ -155,7 +155,7 @@
                 AND inv_product.ylqxzcrbarmc like concat('%',#{ylqxzcrbarmc},'%')
             </if>
             <if test="zczbhhzbapzbh != '' and zczbhhzbapzbh != null">
-                AND inv_product.zczbhhzbapzbh =like concat('%',#{zczbhhzbapzbh},'%')
+                AND inv_product.zczbhhzbapzbh like concat('%',#{zczbhhzbapzbh},'%')
             </if>
             <if test="customerId != '' and customerId != null">
                 AND inv_product.customerId = #{customerId}