单据删除

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

@@ -93,6 +93,7 @@ public class BussinessLocalTypeController {
 
         if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
             bussinessTypeFilterRequest.setSpUse(true);
+
         } else {
             bussinessTypeFilterRequest.setUserId(customerService.getUserId());
         }

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

@@ -64,9 +64,8 @@ public class EntrustReceController {
 
 
     @GetMapping("/spms/entrust/rece/filterAllNoUse")
-    public BaseResponse filterAllNoUse(BasicEntrustRecRequest basicExportStatusRequest) {
+    public BaseResponse filterAllNoUse(BussinessTypeFilterRequest bussinessTypeFilterRequest) {
         Integer uerId = customerService.getUserId();
-        BussinessTypeFilterRequest bussinessTypeFilterRequest = new BussinessTypeFilterRequest();
         bussinessTypeFilterRequest.setUserId(uerId);
         List<BussinessTypeEntity> bussinessTypeEntities = bussinessTypeService.filterAllByUser(bussinessTypeFilterRequest);
         return ResultVOUtils.success(bussinessTypeEntities);

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

@@ -589,14 +589,25 @@ public class WareHouseController {
         if (StrUtil.isEmpty(udiEntity.getSerialNo()) && StrUtil.isEmpty(udiEntity.getBatchNo())) {
             return ResultVOUtils.error(500, "批次号不能为空！");
         }
-
+        String orderId = addOrderRequest.getOrderId();
 //        String isCheck = systemParamConfigService.selectValueByParamKey("code_fill_check");
 
         //三期校验
         if (addOrderRequest.isCodeFillCheck()) {
+
             BaseResponse checkOriginCodeRes = checkOriginCode(udiEntity);
-            if (checkOriginCodeRes != null)
+            if (checkOriginCodeRes != null) {
-                return checkOriginCodeRes;
+                if (StrUtil.isNotEmpty(orderId)) {
+                    WarehouseQueryRequest warehouseQueryRequest = new WarehouseQueryRequest();
+                    warehouseQueryRequest.setOrderId(orderId);
+                    List<WarehouseEntity> warehouseEntitys = codesTempService.findByOrderIdAndCode(warehouseQueryRequest);
+                    WarehouseEntity warehouseEntity = isExitLocal(code, warehouseEntitys);
+                    if (warehouseEntity == null) {
+                        return checkOriginCodeRes;
+                    }
+                } else
+                    return checkOriginCodeRes;
+            }
         }
 
 
@@ -630,8 +641,14 @@ public class WareHouseController {
                 }
             }
         }
-
+        if (bussinessTypeEntity.isPreIn()) {
-        String orderId = addOrderRequest.getOrderId();
+            if (StrUtil.isNotEmpty(udiEntity.getSerialNo())) {
+                List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailService.findByOriginCode(code);
+                if(CollUtil.isNotEmpty(invProductDetailEntities)){
+                    return ResultVOUtils.error(500, "条码已存在！");
+                }
+            }
+        }
 
         //预验收校验
         if (addOrderRequest.isPreCheck()) {

api-admin/src/main/java/com/glxp/sale/admin/service/inout/impl/OrderServiceImpl.java

@@ -471,15 +471,16 @@ public class OrderServiceImpl implements OrderService {
                     codesDao.deleteByOrderId(id);
                     //查询业务单据
                     StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
-                    stockOrderFilterRequest.setBillNo(orderEntity.getErpFk());
+                    if (StrUtil.isNotEmpty(orderEntity.getErpFk())) {
-                    StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest);
+                        stockOrderFilterRequest.setBillNo(orderEntity.getErpFk());
-                    if (stockOrderEntity != null) {
+                        StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest);
-                        //删除业务单据详情
+                        if (stockOrderEntity != null) {
-                        stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId());
+                            //删除业务单据详情
-                        //删除业务单据
+                            stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId());
-                        stockOrderDao.deleteById(stockOrderEntity.getId());
+                            //删除业务单据
+                            stockOrderDao.deleteById(stockOrderEntity.getId());
+                        }
                     }
-
                     //删除扫码单据详情
                     orderDetailDao.deleteByOrderId(id);
                     //删除扫码单据
@@ -495,14 +496,16 @@ public class OrderServiceImpl implements OrderService {
                     orderDao.deleteById(id);
                     orderDetailDao.deleteByOrderId(id);
                     //查询业务单据
-                    StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
+                    if (StrUtil.isNotEmpty(orderEntity.getErpFk())) {
-                    stockOrderFilterRequest.setBillNo(orderEntity.getErpFk());
+                        StockOrderFilterRequest stockOrderFilterRequest = new StockOrderFilterRequest();
-                    StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest);
+                        stockOrderFilterRequest.setBillNo(orderEntity.getErpFk());
-                    if (stockOrderEntity != null) {
+                        StockOrderEntity stockOrderEntity = stockOrderDao.findOne(stockOrderFilterRequest);
-                        //删除业务单据详情
+                        if (stockOrderEntity != null) {
-                        stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId());
+                            //删除业务单据详情
-                        //删除业务单据
+                            stockOrderDetailDao.deleteByOrderIdFk(stockOrderEntity.getId());
-                        stockOrderDao.deleteById(stockOrderEntity.getId());
+                            //删除业务单据
+                            stockOrderDao.deleteById(stockOrderEntity.getId());
+                        }
                     }
 
                     //删除码

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/InvPreInProductDetailService.java

@@ -7,6 +7,7 @@ import com.glxp.sale.admin.res.inventory.InvProductDetailJoinResponse;
 import java.util.List;
 
 public interface InvPreInProductDetailService {
+    List<InvProductDetailEntity> findByOriginCode(String code);
 
     List<InvProductDetailEntity> filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest);
 

api-admin/src/main/java/com/glxp/sale/admin/service/inventory/impl/InvPreInProductDetailServiceImpl.java

@@ -29,6 +29,14 @@ public class InvPreInProductDetailServiceImpl implements InvPreInProductDetailSe
     @Resource
     InvPreInProductDao invPreInProductDao;
 
+    @Override
+    public List<InvProductDetailEntity> findByOriginCode(String code) {
+        FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
+        filterInvProductDetailRequest.setOriginCode(code);
+        List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
+        return invProductDetailEntities;
+    }
+
     @Override
     public List<InvProductDetailEntity> filterInvProduct(FilterInvProductDetailRequest filterInvProductDetailRequest) {
         if (filterInvProductDetailRequest == null) {

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

@@ -55,7 +55,8 @@
         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_bussiness_type.storageCode,basic_bussiness_type.corpType,basic_bussiness_type.mainAction
-        ,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,basic_bustype_local.preIn
+        ,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,basic_bustype_local.preIn,
+        basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck
         FROM basic_bustype_local
         inner join basic_bussiness_type
         on basic_bustype_local.action = basic_bussiness_type.localAction

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

@@ -161,7 +161,7 @@
                 AND productIdFk = #{productIdFk}
             </if>
             <if test="batchNo != '' and batchNo != null and batchNo!='empty'">
-                AND inv_product.batchNo like concat('%',#{batchNo},'%')
+                AND inv_pre_product_detail.batchNo like concat('%',#{batchNo},'%')
             </if>
             <if test="batchNo == 'empty'">
                 AND batchNo is NULL

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

@@ -161,7 +161,7 @@
                 AND productIdFk = #{productIdFk}
             </if>
             <if test="batchNo != '' and batchNo != null and batchNo!='empty'">
-                AND inv_product.batchNo like concat('%',#{batchNo},'%')
+                AND inv_product_detail.batchNo like concat('%',#{batchNo},'%')
             </if>
             <if test="batchNo == 'empty'">
                 AND batchNo is NULL

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

@@ -151,6 +151,9 @@
             <if test="pcode != null">
                 AND pcode = #{pcode}
             </if>
+            <if test="status != null">
+                AND status = #{status}
+            </if>
             <if test="spUse != null">
                 AND spUse = #{spUse}
             </if>