1.修复部分bug

src/main/java/com/glxp/udi/admin/controller/TestController.java

@@ -8,7 +8,7 @@ import com.glxp.udi.admin.dao.inout.*;
 import com.glxp.udi.admin.entity.inout.*;
 import com.glxp.udi.admin.entity.mongo.*;
 import com.glxp.udi.admin.mongo.dao.*;
-import com.glxp.udi.admin.service.inout.OrderDetailService;
+import com.glxp.udi.admin.service.inout.UdiInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -23,8 +23,6 @@ import java.util.List;
 @RestController
 public class TestController {
 
-    @Resource
-    private OrderDetailService orderDetailService;
     @Resource
     private UdiInfoDao udiInfoDao;
 
@@ -55,6 +53,8 @@ public class TestController {
     private InvProductDao invProductDao;
     @Resource
     private InvProductDetailDao invProductDetailDao;
+    @Resource
+    private UdiInfoService udiInfoService;
 
 
     /**
@@ -69,8 +69,12 @@ public class TestController {
             List<WarehouseEntity> warehouseEntities = codesDao.selectList(null);
             warehouseEntities.forEach(code -> {
                 UdiInfoEntity udiInfoEntity = udiInfoDao.selectById(code.getRelId());
-                code.setRelId(udiInfoEntity.getUuid());
+                try {
-                codesDao.updateById(code);
+                    code.setRelId(udiInfoEntity.getUuid());
+                    codesDao.updateById(code);
+                } catch (Exception e) {
+                    log.error(e.getMessage(), e);
+                }
             });
 
             //刷新临时码表
@@ -130,8 +134,10 @@ public class TestController {
                     WarehouseEntity warehouseEntity = new WarehouseEntity();
                     BeanUtil.copyProperties(code, warehouseEntity, "id");
                     String actDate = warehouseEntity.getActDate();
-                    String date = DateUtil.parse(actDate).toString("yyyy-MM-dd HH:mm:ss");
+                    if (StrUtil.isNotBlank(actDate)) {
-                    warehouseEntity.setActDate(date);
+                        String date = DateUtil.parse(actDate).toString("yyyy-MM-dd HH:mm:ss");
+                        warehouseEntity.setActDate(date);
+                    }
                     warehouseEntity.setNameCode(code.getUdi());
                     codesDao.insert(warehouseEntity);
                 });

src/main/java/com/glxp/udi/admin/controller/info/CompanyController.java

@@ -153,12 +153,15 @@ public class CompanyController {
 
         //同步更新客户表数据
         CustomerInfoEntity customerInfoEntity = customerInfoService.selectById(companyEntity.getCustomerId());
-        customerInfoEntity.setCompanyName(companyEntity.getCompanyName());
+        if (null != customerInfoEntity) {
-        customerInfoEntity.setCustomerName(companyEntity.getCompanyName());
+            //管理员账号不在客户表中
-        customerInfoEntity.setArea(companyEntity.getArea());
+            customerInfoEntity.setCompanyName(companyEntity.getCompanyName());
-        customerInfoEntity.setDetailAddr(companyEntity.getDetailAddr());
+            customerInfoEntity.setCustomerName(companyEntity.getCompanyName());
-        customerInfoEntity.setCreditNum(companyEntity.getCreditNum());
+            customerInfoEntity.setArea(companyEntity.getArea());
-        customerInfoService.updateCustomerInfo(customerInfoEntity);
+            customerInfoEntity.setDetailAddr(companyEntity.getDetailAddr());
+            customerInfoEntity.setCreditNum(companyEntity.getCreditNum());
+            customerInfoService.updateCustomerInfo(customerInfoEntity);
+        }
         return ResultVOUtils.success("修改成功");
     }
 

src/main/java/com/glxp/udi/admin/controller/inout/WareHouseController.java

@@ -36,7 +36,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
-import javax.validation.Valid;
 import java.util.*;
 
 @RestController
@@ -121,7 +120,7 @@ public class WareHouseController {
 
     @AuthRuleAnnotation("")
     @GetMapping("/warehouse/inout/warehouseBussniessTypeList")
-    public BaseResponse getWarehouseBussniessTypeList(@Valid FilterInvLinkDataRequest filterInvLinkDataRequest) {
+    public BaseResponse getWarehouseBussniessTypeList(FilterInvLinkDataRequest filterInvLinkDataRequest) {
         Page<WarehouseBussinessTypeEntity> page = warehouseBussinessTypeService.filterList(filterInvLinkDataRequest);
         PageSimpleResponse<WarehouseBussinessTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
         pageSimpleResponse.setTotal(page.getTotal());

src/main/java/com/glxp/udi/admin/service/inout/WarehouseBussinessTypeService.java

@@ -81,7 +81,7 @@ public class WarehouseBussinessTypeService {
         if (null == filterInvLinkDataRequest) {
             return new Page<>();
         }
-        Page<WarehouseBussinessTypeEntity> page = new Page<>(filterInvLinkDataRequest.getPage(), filterInvLinkDataRequest.getLimit());
+        Page<WarehouseBussinessTypeEntity> page = new Page<>(filterInvLinkDataRequest.getPage() == null ? 1 : filterInvLinkDataRequest.getPage(), filterInvLinkDataRequest.getLimit() == null ? 10000 : filterInvLinkDataRequest.getLimit());
         return warehouseBussinessTypeDao.selectListByCode(page, filterInvLinkDataRequest.getCode());
     }
 }

src/main/java/com/glxp/udi/admin/service/param/SystemPDFTemplateService.java

@@ -37,6 +37,9 @@ public class SystemPDFTemplateService {
      * @param systemPDFTemplateSaveRequest
      */
     public void updateById(SystemPDFTemplateSaveRequest systemPDFTemplateSaveRequest) {
+        if (StrUtil.isBlank(systemPDFTemplateSaveRequest.getCustomerId())) {
+            systemPDFTemplateSaveRequest.setCustomerId(null);
+        }
         systemPDFTemplateDao.updateByParams(systemPDFTemplateSaveRequest);
     }
 

src/main/resources/mybatis/mapper/param/SystemPDFTemplateDao.xml

@@ -38,12 +38,8 @@
             <if test="jrxmlPath != null">
                 jrxmlPath=#{jrxmlPath},
             </if>
-            <if test="customerId != null and customerId != ''">
+            customerId = #{customerId},
-                customerId = #{customerId},
+            action     = #{action}
-            </if>
-            <if test="action != null and action != ''">
-                action = #{action}
-            </if>
         </set>
         WHERE id = #{id}
     </update>