bug修改代码备份

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

@@ -159,7 +159,7 @@ public class BasicBussinessTypeController extends BaseController {
         }
 
         if (bussinessTypeSaveRequest != null) {
-            boolean exists = basicBussinessTypeService.checkBusTypeNameExists(bussinessTypeSaveRequest.getName(), bussinessTypeSaveRequest.getId().intValue());
+            boolean exists = basicBussinessTypeService.checkBusTypeNameExists(bussinessTypeSaveRequest.getName(), bussinessTypeSaveRequest.getId().longValue());
             if (exists) {
                 return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, "单据类型名称重复！");
             }

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

@@ -24,6 +24,7 @@ import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
 import java.io.File;
+import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.List;
 
@@ -91,7 +92,7 @@ public class BasicCorpImportLogController {
             try {
                 String fileType = fileName.substring(fileName.lastIndexOf("."));
                 if (".udi".equalsIgnoreCase(fileType) || ".LowerIn".equalsIgnoreCase(fileType)) {
-                    String jsonData = IoUtil.read(file.getInputStream()).toString();
+                    String jsonData = IoUtil.read(file.getInputStream(), StandardCharsets.UTF_8).toString();
                     BasicCorpExportLogResponse data = JSONUtil.toBean(jsonData, BasicCorpExportLogResponse.class);
 
                     //导入日志

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

@@ -753,6 +753,9 @@ public class IoCodeTempController extends BaseController {
 
 
             BaseResponse baseResponse = checkRelId(codeEnttity, unitFk);
+            if (baseResponse != null) {
+                deleteEmptyBillNo(orderEntity);
+            }
 
             //判断证书是否过期
 //            if (codeEnttity.getRelId() != null && bussinessTypeEntity.isCheckCertExpire()) {
@@ -766,6 +769,7 @@ public class IoCodeTempController extends BaseController {
 
             BaseResponse invRes = checkInv(bussinessTypeEntity, codeEnttity);
             if (invRes != null) {
+                deleteEmptyBillNo(orderEntity);
                 return invRes;
             }
             genDetaiEntity = codeEnttity;
@@ -1083,6 +1087,15 @@ public class IoCodeTempController extends BaseController {
     }
 
 
+    public void deleteEmptyBillNo(IoOrderEntity orderEntity) {
+        boolean r1 = orderDetailBizService.isExit(orderEntity.getBillNo());
+        boolean r2 = ioOrderDetailCodeService.isExit(orderEntity.getBillNo());
+        if (!r1 && !r2) {
+            orderService.deleteByBillNo(orderEntity.getBillNo());
+        }
+    }
+
+
     @AuthRuleAnnotation("")
     @PostMapping("warehouse/inout/saveTempCode")
     @Log(title = "单据管理", businessType = BusinessType.UPDATE)

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

@@ -112,7 +112,7 @@ public interface IBasicBussinessTypeService extends IService<BasicBussinessTypeE
      * @param id   单据类型ID
      * @return
      */
-    boolean checkBusTypeNameExists(String name, Integer id);
+    boolean checkBusTypeNameExists(String name, Long id);
 
     List<BasicBussinessTypeEntity> selectIgnoreSelf(String action);
 

src/main/java/com/glxp/api/service/basic/impl/BasicBussinessTypeServiceImpl.java

@@ -175,7 +175,7 @@ public class BasicBussinessTypeServiceImpl extends ServiceImpl<BasicBussinessTyp
     }
 
     @Override
-    public boolean checkBusTypeNameExists(String name, Integer id) {
+    public boolean checkBusTypeNameExists(String name, Long id) {
         List<BasicBussinessTypeEntity> list = basicBussinessTypeDao.selectList(new QueryWrapper<BasicBussinessTypeEntity>().select("name", "id").eq("name", name));
         if (CollUtil.isEmpty(list)) {
             return false;

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

@@ -263,7 +263,7 @@
         limit 1
     </select>
 
-    <insert id="importBasicUnitMaintain" keyProperty="id">
+    <insert id="importBasicUnitMaintain">
         REPLACE
                 INTO basic_corp
                 (thirdId, erpId, `name`, spell,