修复：扫码单据删除，内部单据选择单据类型修改

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

@@ -9,6 +9,7 @@ import com.glxp.sale.admin.entity.basic.BussinessTypeEntity;
 import com.glxp.sale.admin.entity.inout.StockOrderEntity;
 import com.glxp.sale.admin.exception.JsonException;
 import com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest;
+import com.glxp.sale.admin.req.basic.BussinessTypeFilterRequest;
 import com.glxp.sale.admin.req.info.DeleteRequest;
 import com.glxp.sale.admin.req.inout.StockOrderFilterRequest;
 import com.glxp.sale.admin.res.PageSimpleResponse;
@@ -55,6 +56,11 @@ public class BussinessLocalTypeController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+        String customerId = getCustomerId();
+        if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
+            bussinessTypeFilterRequest.setSpUse(true);
+        }
+
         List<BussinessLocalTypeEntity> bussinessTypeEntities;
         bussinessTypeEntities = bussinessLocalTypeService.filterJoin(
                 bussinessTypeFilterRequest);
@@ -112,11 +118,19 @@ public class BussinessLocalTypeController {
         }
         String id = deleteRequest.getId();
         BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.selectById(id);
-        StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
+
-        stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction());
+        BussinessLocalTypeFilterRequest bussinessTypeFilterRequest = new BussinessLocalTypeFilterRequest();
-        StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
+        bussinessTypeFilterRequest.setAction(bussinessLocalTypeEntity.getAction());
-        if (stockOrderEntity != null) {
+        List<BussinessLocalTypeEntity> bussinessLocalTypeEntities = bussinessLocalTypeService.filterJoin(bussinessTypeFilterRequest);
-            return ResultVOUtils.error(500, "已存在该类型码业务单据，无法删除！");
+        if (bussinessLocalTypeEntities != null && bussinessLocalTypeEntities.size() > 0) {
+            return ResultVOUtils.error(500, "该业务单据类型已被扫码单据类型绑定，无法删除！");
+        }else{
+            StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
+            stockOrderFilterRequest.setBillType(bussinessLocalTypeEntity.getAction());
+            StockOrderEntity stockOrderEntity = stockOrderService.findOne(stockOrderFilterRequest);
+            if (stockOrderEntity != null) {
+                return ResultVOUtils.error(500, "已存在该类型业务单据，无法删除！");
+            }
         }
 
         BussinessChangeTypeEntity bussinessChangeTypeEntity = bussinessChangeTypeService.findFirstByAction(bussinessLocalTypeEntity.getAction());

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

@@ -110,11 +110,12 @@ public class BussinessTypeController {
         if (orderEntity != null) {
             return ResultVOUtils.error(500, "已存在该类型扫码单据，无法删除！");
         }
-
+//        if (bussinessTypeEntity.getLocalAction() != null && !bussinessTypeEntity.getLocalAction().equals("")) {
-        BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction());
+//            BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction());
-        if (bussinessLocalTypeEntity != null && !"".equals(bussinessLocalTypeEntity)) {
+//            if (bussinessLocalTypeEntity != null && !"".equals(bussinessLocalTypeEntity)) {
-            return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型，无法删除！");
+//                return ResultVOUtils.error(500, "该扫码单据类型已绑定业务单据类型，无法删除！");
-        }
+//            }
+//        }
         bussinessTypeService.deleteById(id);
         return ResultVOUtils.success("删除成功");
     }

api-admin/src/main/java/com/glxp/sale/admin/controller/inout/WareHouseController.java

@@ -253,9 +253,9 @@ public class WareHouseController {
             if (udiEntity == null)
                 return ResultVOUtils.error(500, "UDI码格式错误！");
             String orderId = addOrderRequest.getOrderId();
-            CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(addOrderRequest.getCustomerId()));
+//            CompanyEntity companyEntity = companyService.findCompany(Long.parseLong(addOrderRequest.getCustomerId()));
-            addOrderRequest.setFromCorp(companyEntity.getCompanyName());
+//            addOrderRequest.setFromCorp(companyEntity.getCompanyName());
-            addOrderRequest.setFromCorpId((companyEntity.getUnitIdFk()));
+//            addOrderRequest.setFromCorpId((companyEntity.getUnitIdFk()));
             BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(addOrderRequest.getBillType());
             if (StringUtils.isBlank(orderId)) {
                 orderId = System.currentTimeMillis() + new Random().nextInt(10) + "";
@@ -265,8 +265,6 @@ public class WareHouseController {
                     orderSaveRequest.setActDate(addOrderRequest.getActDate());
                 }
 
-                orderSaveRequest.setFromCorpId(companyEntity.getUnitIdFk());
-                orderSaveRequest.setFromCorp(companyEntity.getCompanyName());
 
 
                 orderSaveRequest.setMainAction(bussinessTypeEntity.getMainAction());
@@ -274,8 +272,8 @@ public class WareHouseController {
                 orderSaveRequest.setActor(addOrderRequest.getActor());
                 orderSaveRequest.setCorpOrderId(addOrderRequest.getCorpOrderId());
                 orderSaveRequest.setLocStorageCode(addOrderRequest.getLocStorageCode());
-//                orderSaveRequest.setFromCorpId(addOrderRequest.getFromCorpId());
+                orderSaveRequest.setFromCorpId(addOrderRequest.getFromCorpId());
-//                orderSaveRequest.setFromCorp(addOrderRequest.getFromCorp());
+                orderSaveRequest.setFromCorp(addOrderRequest.getFromCorp());
                 orderSaveRequest.setFromType(ConstantStatus.FROM_WEBNEW);
                 orderSaveRequest.setStatus(ConstantStatus.ORDER_STATUS_TEMP_SAVE);
                 orderSaveRequest.setExportStatus(ConstantStatus.ORDER_EXPORT_UN);

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessLocalTypeEntity.java

@@ -17,5 +17,7 @@ public class BussinessLocalTypeEntity {
     private Boolean advanceType;
     private Boolean changeEnable;
     private Boolean spUse;
+    private String storageCode;
+    private int corpType;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/entity/basic/BussinessTypeEntity.java

@@ -36,6 +36,7 @@ public class BussinessTypeEntity {
     private boolean secCheckChange;
 
     private int corpType;
+    private String storageCode;
 
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessLocalTypeFilterRequest.java

@@ -13,5 +13,6 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest {
     private String originAction;
     private Boolean changeEnable;
     private Boolean spUse;
+    private Boolean isFilter;
 
 }

api-admin/src/main/java/com/glxp/sale/admin/req/basic/BussinessTypeFilterRequest.java

@@ -14,5 +14,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
     private Boolean advanceType;
     private String type;
     private Boolean spUse;
+    private String localAction;
     private Boolean secCheckEnable;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/basic/BussinessTypResponse.java

@@ -20,7 +20,7 @@ public class BussinessTypResponse {
     private Boolean advanceType;        //是否预入库
     private Boolean changeEnable;
     private Boolean genUnit;
-//    private Boolean innerOrder;
+    //    private Boolean innerOrder;
     private Boolean spUse;
     private String localName;
     private Boolean secCheckEnable;
@@ -40,4 +40,5 @@ public class BussinessTypResponse {
     private boolean secCheckWebNew;
     private boolean secCheckChange;
     private int corpType;
+    private String storageCode;
 }

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

@@ -204,7 +204,7 @@ public class BasicUdiInfoImportService {
             udiRelevanceEntity.setSptm(udiInfoImportDetailEntity.getSptm());
         }
 
-        if (udiInfoImportDetailEntity.getIsUseDy() != null && udiInfoImportDetailEntity.getIsUseDy().trim().equals("")) {
+        if (udiInfoImportDetailEntity.getIsUseDy() != null && !udiInfoImportDetailEntity.getIsUseDy().trim().equals("")) {
             if (udiInfoImportDetailEntity.getIsUseDy().equals("是")) {
                 udiRelevanceEntity.setIsUseDy(true);
             } else {

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

@@ -29,10 +29,10 @@
 
     <select id="filterJoin" parameterType="com.glxp.sale.admin.req.basic.BussinessLocalTypeFilterRequest"
             resultType="com.glxp.sale.admin.entity.basic.BussinessLocalTypeEntity">
-        SELECT basic_bustype_local.name localName, basic_bustype_local.action localAction,originAction,
+        SELECT basic_bustype_local.id,basic_bustype_local.name localName, basic_bustype_local.action localAction,originAction,
         basic_bussiness_type.name ,
         basic_bussiness_type.action,basic_bussiness_type.checkEnable,basic_bustype_local.advanceType,basic_bustype_local.changeEnable
-        , basic_bustype_local.spUse
+        , basic_bustype_local.spUse,basic_bussiness_type.storageCode,basic_bussiness_type.corpType
         FROM basic_bustype_local inner join
         basic_bussiness_type
         on basic_bustype_local.action = basic_bussiness_type.localAction
@@ -46,6 +46,9 @@
             <if test="enabled != ''and enabled != null">
                 AND basic_bustype_local.enable =#{enabled}
             </if>
+            <if test="enabled != ''and enabled != null">
+                AND basic_bussiness_type.enable =#{enabled}
+            </if>
             <if test="spUse != ''and spUse != null">
                 AND spUse =#{spUse}
             </if>

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

@@ -15,7 +15,7 @@
         basic_bussiness_type.secCheckWebNew, basic_bussiness_type.secCheckChange,
         basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
         basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,
-        basic_bustype_local.spUse,corpType
+        basic_bustype_local.spUse,corpType,basic_bussiness_type.storageCode
         FROM basic_bussiness_type LEFT JOIN basic_bustype_local
         on basic_bussiness_type.localAction = basic_bustype_local.action
         <where>
@@ -45,7 +45,7 @@
         select basic_bussiness_type.*,
         basic_bustype_local.name localName,basic_bussiness_type.checkEnable, basic_bustype_local.advanceType,
         basic_bustype_local.changeEnable,basic_bussiness_type.genUnit,basic_bussiness_type.innerOrder,
-        basic_bustype_local.spUse from basic_bussiness_type LEFT JOIN
+        basic_bustype_local.spUse,basic_bussiness_type.storageCode from basic_bussiness_type LEFT JOIN
         basic_third_sys on basic_bussiness_type.thirdSysFk =
         basic_third_sys.thirdId LEFT JOIN basic_bustype_local on basic_bussiness_type.localAction =
         basic_bustype_local.action
@@ -68,6 +68,9 @@
             <if test="spUse != ''and spUse != null">
                 AND basic_bustype_local.spUse =#{spUse}
             </if>
+            <if test="localAction != ''and localAction != null">
+                AND basic_bustype_local.localAction =#{localAction}
+            </if>
             <if test="secCheckEnable != ''and secCheckEnable != null">
                 AND basic_bussiness_type.secCheckEnable =#{secCheckEnable}
             </if>
@@ -83,7 +86,7 @@
         (action,name,enable,remark,mainAction,localAction,thirdSysFk,
         checkEnable,genUnit,innerOrder,secCheckEnable,
         checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
-        ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,corpType)
+        ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,corpType,basic_bussiness_type.storageCode)
         values
             (
         #{action},
@@ -108,7 +111,8 @@
         #{secCheckPdaUn},
         #{secCheckPc},
         #{secCheckWebNew},
-        #{secCheckChange},#{corpType}
+        #{secCheckChange},
+        #{corpType}, #{storageCode}
         )
     </insert>
 
@@ -121,7 +125,7 @@
         (`index`,action,name,enable,remark,mainAction,localAction,thirdSysFk,
         checkEnable,genUnit,innerOrder,secCheckEnable,
         checkUdims,checkPdaEd,checkPdaUn,checkPc,checkWebNew,checkChange
-        ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,corpType)
+        ,secCheckUdims,secCheckPdaEd,secCheckPdaUn,secCheckPc,secCheckWebNew,secCheckChange,corpType,storageCode)
         values
             (
         #{index},
@@ -147,7 +151,8 @@
         #{secCheckPdaUn},
         #{secCheckPc},
         #{secCheckWebNew},
-        #{secCheckChange},#{corpType}
+        #{secCheckChange},
+        #{corpType},#{storageCode}
         )
     </insert>
 
@@ -179,6 +184,8 @@
             <if test="secCheckChange != null">secCheckChange=#{secCheckChange},</if>
             <if test="index != null">index=#{index},</if>
             <if test="corpType != null">corpType=#{corpType},</if>
+            <if test="storageCode != null">storageCode=#{storageCode},</if>
+
             thirdSysFk=#{thirdSysFk},
         </trim>
         WHERE id = #{id}