业务单据：功能，界面修改优化，单据类型修改

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

@@ -93,12 +93,28 @@ 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.filterList(bussinessTypeFilterRequest);
+        PageInfo<BussinessLocalTypeEntity> pageInfo;
+        pageInfo = new PageInfo<>(bussinessTypeEntities);
+        PageSimpleResponse<BussinessLocalTypeEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(bussinessTypeEntities);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+
+
+    @GetMapping("/udiwms/localBusType/filterUnUse")
+    public BaseResponse filterUnUse(BussinessLocalTypeFilterRequest bussinessTypeFilterRequest,
+                                            BindingResult bindingResult) {
 
+        if (bindingResult.hasErrors()) {
+            return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
+        }
         List<BussinessLocalTypeEntity> bussinessTypeEntities;
         bussinessTypeEntities = bussinessLocalTypeService.filterList(bussinessTypeFilterRequest);
         PageInfo<BussinessLocalTypeEntity> pageInfo;

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

@@ -193,12 +193,12 @@ public class BussinessTypeController {
      * @return
      */
     @GetMapping("/warehouse/bussinessType/candidateBussinessType")
-    public BaseResponse candidateBussinessType(String id) {
-        if (StrUtil.isBlank(id)) {
+    public BaseResponse candidateBussinessType(String mainAction) {
+        if (StrUtil.isBlank(mainAction)) {
             return ResultVOUtils.error(ResultEnum.DATA_ERROR);
         }
         //查询补单单据类型
-        return ResultVOUtils.success(bussinessTypeService.candidateBussinessType(id));
+        return ResultVOUtils.success(bussinessTypeService.candidateBussinessType(mainAction));
     }
 
 }

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

@@ -249,6 +249,9 @@ public class StockOrderDetailController {
 
         List<StockOrderDetailEntity> stockOrderDetailEntityList = new ArrayList<>();
         List<StockOrderDetailEntity> originDatas = stockOrderIdsRequest.getStockOrderLists();
+        if(stockOrderIdsRequest.getDatas()== null && stockOrderIdsRequest.getDatas().size()<1){
+            return ResultVOUtils.error(500,"未选择产品！");
+        }
         for (StockSelectDataEntity stockSelectDataEntity : stockOrderIdsRequest.getDatas()) {
             CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
             companyProductRelevanceRequest.setId(stockSelectDataEntity.getRelId());

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

@@ -14,10 +14,10 @@ public class BussinessLocalTypeEntity {
     private String localName;
     private String remark;
     private Boolean enable;
-    private Boolean checkEnable;
-    private Boolean advanceType;
-    private Boolean changeEnable;
-    private Boolean spUse;
+    private boolean checkEnable;
+    private boolean advanceType;
+    private boolean changeEnable;
+    private boolean spUse;
     private String storageCode;
     private int corpType;
 

api-admin/src/main/java/com/glxp/sale/admin/req/inout/StockOrderFilterRequest.java

@@ -29,4 +29,5 @@ public class StockOrderFilterRequest extends ListPageRequest {
     private String thirdOrderFk;
     private String orderIdFk;
     private BigDecimal totalPrice;
+    private String locStorageCode;
 }

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

@@ -121,10 +121,10 @@ public class BussinessTypeServiceImpl implements BussinessTypeService {
     }
 
     @Override
-    public List<BussinessTypeEntity> candidateBussinessType(String id) {
-        BussinessTypeEntity rawData = bussinessTypeDao.selectById(id);
-        String mainAction;
-        if (rawData.getMainAction().equals(TypeConstant.TYPE_OUT)) {
+    public List<BussinessTypeEntity> candidateBussinessType(String mainAction) {
+//        BussinessTypeEntity rawData = bussinessTypeDao.selectById(id);
+//        String mainAction;
+        if (mainAction.equals(TypeConstant.TYPE_OUT)) {
             mainAction = TypeConstant.TYPE_PUT;
         } else {
             mainAction = TypeConstant.TYPE_OUT;

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

@@ -227,6 +227,8 @@ public class BasicGenExcelService {
     }
     @Async
     public void exportJsonUdiInfo(String genKey, UdiInfoExportRequest udiInfoExportRequest) {
+
+
     }
 
     @Async

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

@@ -172,7 +172,7 @@ public class InvProductsTrService {
 
             //单据流转
             List<BussinessChangeTypeEntity> bussinessChangeTypeEntitys = bussinessChangeTypeService.findByAction(bussinessLocalTypeEntity.getLocalAction());
-            if ((bussinessChangeTypeEntitys != null && bussinessChangeTypeEntitys.size() > 0) && bussinessLocalTypeEntity.getChangeEnable()) {
+            if ((bussinessChangeTypeEntitys != null && bussinessChangeTypeEntitys.size() > 0) && bussinessLocalTypeEntity.isChangeEnable()) {
 
                 //普通出库
                 if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {

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

@@ -184,7 +184,7 @@ public class InvProductsTrService_back {
             }
             //临床出库单据流转
             if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction())
-                    && bussinessLocalTypeEntity.getChangeEnable()
+                    && bussinessLocalTypeEntity.isChangeEnable()
             ) {
 
                 if (ConstantType.TYPE_OUT_CLINIC.equals(bussinessTypeEntity.getAction()))
@@ -213,7 +213,7 @@ public class InvProductsTrService_back {
     //临床是否补单
     public void addOrderChange(OrderEntity orderEntity, BussinessTypeEntity bussinessTypeEntity) {
         BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction());
-        if (bussinessLocalTypeEntity.getChangeEnable()) {
+        if (bussinessLocalTypeEntity.isChangeEnable()) {
             List<BussinessChangeTypeEntity> bussinessChangeTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeEntity.getLocalAction());
             List<WarehouseEntity> warehouseEntities = codesService.findByReceiptId(orderEntity.getId());
             List<WarehouseEntity> preOutList = new ArrayList<>();
@@ -301,7 +301,7 @@ public class InvProductsTrService_back {
     //寄售出库是否补单
     public void addConsignOrderChange(OrderEntity orderEntity, BussinessTypeEntity bussinessTypeEntity) {
         BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeEntity.getLocalAction());
-        if (bussinessLocalTypeEntity.getChangeEnable()) {
+        if (bussinessLocalTypeEntity.isChangeEnable()) {
             List<BussinessChangeTypeEntity> bussinessChangeTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeEntity.getLocalAction());
             List<WarehouseEntity> warehouseEntities = codesService.findByReceiptId(orderEntity.getId());
             List<WarehouseEntity> useInList = new ArrayList<>();

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

@@ -781,6 +781,7 @@ public class IoTransInoutService {
         stockOrderEntity.setCustomerId(orderEntity.getCustomerId());
         stockOrderEntity.setUnitIdFk(orderEntity.getFromCorpId());
         stockOrderEntity.setSourceType(ConstantStatus.ST_SCAN_ADD);
+        stockOrderEntity.setLocStorageCode(orderEntity.getLocStorageCode());
         stockOrderEntity.setCorpId(orderEntity.getFromCorpId());
         if (bussinessTypeEntity.isSecCheckEnable()) {
             stockOrderEntity.setStatus(ConstantStatus.SORDER_DELIVER);

api-admin/src/main/resources/mybatis/mapper/inout/StockOrderDao.xml

@@ -96,7 +96,7 @@
                 and id =#{id}
             </if>
             <if test="billNo != '' and billNo!=null">
-                and billNo =#{billNo}
+                and billNo LIKE concat('%',#{billNo},'%')
             </if>
             <if test="billdate != '' and billdate!=null">
                 and billdate = #{billdate}
@@ -105,7 +105,7 @@
                 and corpId = #{corpId}
             </if>
             <if test="corpName != '' and corpName!=null">
-                and corpName = #{corpName}
+                and corpName LIKE concat('%',#{corpName},'%')
             </if>
             <if test="billType != '' and billType!=null">
                 and billType = #{billType}
@@ -146,6 +146,9 @@
             <if test="totalPrice != '' and totalPrice!=null">
                 and totalPrice = #{totalPrice}
             </if>
+            <if test="locStorageCode != '' and locStorageCode!=null">
+                and locStorageCode = #{locStorageCode}
+            </if>
             <if test="startTime!=null and startTime!=''">
                 <![CDATA[   and DATE_FORMAT(billdate, '%Y-%m-%d')>=  DATE_FORMAT(#{startTime}, '%Y-%m-%d')   ]]>
             </if>