第三方服务bug修改！功能大改造取得阶段性胜利

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

@@ -55,33 +55,27 @@ public class BussinessChangeTypeController {
             if (bussinessTypeFilterRequest.getType() != null
                     && "changeEnable".equals(bussinessTypeFilterRequest.getType())
             ) {
-//                if (ConstantType.TYPE_PUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
-//                    BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
-//                    bussinessChangeTypeEntity1.setIntro("入库自动补\"寄售出库单\"");
-//                    bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_OUT);
-//                    bussinessChangeTypeEntity1.setIndex(1);
-//                    bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
-//                    bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
-//                    bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
-//                } else
                 if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && !bussinessTypeEntity.isAdvanceType()) {
                     BussinessChangeTypeEntity bussinessChangeTypeEntity1 = new BussinessChangeTypeEntity();
                     bussinessChangeTypeEntity1.setIntro("出库自动补\"供应商入库单\"");
                     bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_IN);
                     bussinessChangeTypeEntity1.setIndex(1);
                     bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
+                    bussinessChangeTypeEntity1.setBeforeTime(1);
                     bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
                     BussinessChangeTypeEntity bussinessChangeTypeEntity2 = new BussinessChangeTypeEntity();
                     bussinessChangeTypeEntity2.setIntro("出库自动补\"调拨入库单\"");
                     bussinessChangeTypeEntity2.setChangeType(ConstantStatus.ORDER_CHANGE_INNOR_NORMAL_IN);
                     bussinessChangeTypeEntity2.setIndex(1);
                     bussinessChangeTypeEntity2.setAction(bussinessTypeFilterRequest.getAction());
+                    bussinessChangeTypeEntity1.setBeforeTime(1);
                     bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity2);
                     BussinessChangeTypeEntity bussinessChangeTypeEntity3 = new BussinessChangeTypeEntity();
                     bussinessChangeTypeEntity3.setIntro("出库自动补\"寄售转入单\"");
                     bussinessChangeTypeEntity3.setChangeType(ConstantStatus.ORDER_CHANGE_NORMAL_ADV_IN);
                     bussinessChangeTypeEntity3.setIndex(2);
                     bussinessChangeTypeEntity3.setAction(bussinessTypeFilterRequest.getAction());
+                    bussinessChangeTypeEntity1.setBeforeTime(1);
                     bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity3);
                     bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
                 } else if (ConstantType.TYPE_OUT.equals(bussinessTypeEntity.getMainAction()) && bussinessTypeEntity.isAdvanceType()) {
@@ -90,6 +84,7 @@ public class BussinessChangeTypeController {
                     bussinessChangeTypeEntity1.setChangeType(ConstantStatus.ORDER_CHANGE_ADVANCE_IN);
                     bussinessChangeTypeEntity1.setIndex(1);
                     bussinessChangeTypeEntity1.setAction(bussinessTypeFilterRequest.getAction());
+                    bussinessChangeTypeEntity1.setBeforeTime(1);
                     bussinessChangeTypeService.insertBusChangeTypee(bussinessChangeTypeEntity1);
                     bussinessTypeEntities = bussinessChangeTypeService.findByAction(bussinessTypeFilterRequest.getAction());
                 }

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

@@ -1,5 +1,6 @@
 package com.glxp.api.admin.controller.basic;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
@@ -14,7 +15,9 @@ import com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity;
 import com.glxp.api.admin.entity.basic.BussinessTypeEntity;
 import com.glxp.api.admin.entity.basic.CndidateRequest;
 import com.glxp.api.admin.entity.inout.OrderEntity;
+import com.glxp.api.admin.entity.inout.WarehouseBussinessTypeEntity;
 import com.glxp.api.admin.entity.inout.WarehouseEntity;
+import com.glxp.api.admin.req.basic.FilterInvBusTypeRequest;
 import com.glxp.api.admin.req.inout.DeleteRequest;
 import com.glxp.api.admin.req.inout.OrderFilterRequest;
 import com.glxp.api.admin.req.inout.PostOrderRequest;
@@ -29,6 +32,7 @@ import com.glxp.api.admin.service.auth.CustomerService;
 import com.glxp.api.admin.service.basic.BussinessLocalTypeService;
 import com.glxp.api.admin.service.basic.BussinessTypeService;
 import com.glxp.api.admin.service.inout.OrderService;
+import com.glxp.api.admin.service.inout.WarehouseBussinessTypeService;
 import com.glxp.api.admin.util.CustomUtil;
 import com.glxp.api.admin.util.FileUtils;
 import com.glxp.api.common.enums.ResultEnum;
@@ -173,6 +177,8 @@ public class BussinessTypeController {
         return ResultVOUtils.success(pageSimpleResponse);
     }
 
+    @Resource
+    WarehouseBussinessTypeService warehouseBussinessTypeService;
 
     @AuthRuleAnnotation("")
     @PostMapping("/udiwms/bussinessType/delete")
@@ -190,6 +196,15 @@ public class BussinessTypeController {
             return ResultVOUtils.error(500, "已存在该类型扫码单据，无法删除！");
         }
 
+
+        FilterInvBusTypeRequest filterInvBusTypeRequest = new FilterInvBusTypeRequest();
+        filterInvBusTypeRequest.setAction(bussinessTypeEntity.getAction());
+        List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = warehouseBussinessTypeService.filterList(filterInvBusTypeRequest);
+        if (CollUtil.isNotEmpty(warehouseBussinessTypeEntities)) {
+            return ResultVOUtils.error(500, "单据类型已被仓库分库绑定，无法删除");
+        }
+
+
         bussinessTypeService.deleteById(id);
         return ResultVOUtils.success("删除成功");
     }

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

@@ -145,6 +145,9 @@ public class UdiContrastController {
         udiRelevanceEntity.setMeasname(combineRequest.getMeasname());
         udiRelevanceEntity.setSupName(combineRequest.getSupName());
         udiRelevanceEntity.setPrice(combineRequest.getPrice());
+        udiRelevanceEntity.setSptm(combineRequest.getSptm());
+        udiRelevanceEntity.setYbbm(combineRequest.getYbbm());
+
         UdiRelevanceEntity temp = udiContrastService.findById(udiRelevanceEntity.getId());
         if (udiContrastService.isExit(temp.getOriginUuid(), udiRelevanceEntity.getMainId(), combineRequest.getThirdSys())) {
             return ResultVOUtils.error(500, "已存在相同的对照关系,对照失败!");

api-admin/src/main/java/com/glxp/api/admin/controller/business/StockQRCodeTextController.java

@@ -13,6 +13,7 @@ import com.glxp.api.admin.entity.business.StockQRCodeTextEntity;
 import com.glxp.api.admin.entity.info.CompanyEntity;
 import com.glxp.api.admin.entity.info.SystemPDFModuleEntity;
 import com.glxp.api.admin.entity.info.SystemPDFTemplateEntity;
+import com.glxp.api.admin.entity.info.SystemParamConfigEntity;
 import com.glxp.api.admin.entity.inout.OrderEntity;
 import com.glxp.api.admin.entity.inventory.StockPrintEntity;
 import com.glxp.api.admin.entity.inventory.StockPrintTempEntity;
@@ -94,7 +95,7 @@ public class StockQRCodeTextController {
     @Resource
     private BussinessLocalTypeService bussinessLocalTypeService;
     @Resource
-    private BussinessTypeService bussinessTypeService;
+    SystemParamConfigService systemParamConfigService;
 
     @AuthRuleAnnotation("")
     @GetMapping("/udiwms/stock/qrcode/text/filter")
@@ -384,6 +385,10 @@ public class StockQRCodeTextController {
         List<SystemPDFTemplateRelevanceResponse> systemPDFTemplateRelevanceResponses = systemPDFTemplateRelevanceService.filterList(systemPDFTemplateRelevanceRequest);
         if (systemPDFTemplateRelevanceResponses == null || systemPDFTemplateRelevanceResponses.size() < 1) return;
         SystemPDFTemplateRelevanceResponse systemPDFTemplateRelevanceResponse = systemPDFTemplateRelevanceResponses.get(0);
+
+        SystemParamConfigEntity systemParamConfigEntity = systemParamConfigService.selectByParamKey("order_print_by_thrproduct");
+
+
         if (bussinessLocalTypeEntity.getOrderVisibleType() == 0) {
             /*打印订单*/
             List<StockOrderPrintEntity> list = stockOrderService.listOrderPrint(stockQRCodeTextPDFTemplateRequest.getId());
@@ -409,6 +414,11 @@ public class StockQRCodeTextController {
                     stockOrderPrintEntity.setRemark2(systemPDFModuleEntity.getRemark2());
                     stockOrderPrintEntity.setRemark3(systemPDFModuleEntity.getRemark3());
                     stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
+                    if (orderEntity != null)
+                        stockOrderPrintEntity.setBillRemark(orderEntity.getPrintRemark());
+                    if (systemParamConfigEntity.getParamValue().equals("1")) {
+                        tranfByThr(stockOrderPrintEntity);
+                    }
                     index++;
                 }
 
@@ -455,9 +465,13 @@ public class StockQRCodeTextController {
                     if (stockOrderDetailEntity != null) {
                         stockOrderPrintEntity.setPrice(stockOrderDetailEntity.getPrice());
                     }
-                    index++;
 
                     stockOrderPrintEntity.setCount(stockOrderPrintEntity.getCount() * getActCount(stockOrderPrintEntity));
+                    if (systemParamConfigEntity.getParamValue().equals("1")) {
+                        tranfByThr(stockOrderPrintEntity);
+                    }
+                    index++;
+
                 }
 
                 Map<String, Object> data = new HashMap<String, Object>();
@@ -471,6 +485,24 @@ public class StockQRCodeTextController {
         }
     }
 
+
+    public void tranfByThr(StockOrderPrintEntity stockOrderPrintEntity) {
+
+
+        if (stockOrderPrintEntity != null) {
+            if (StrUtil.isNotEmpty(stockOrderPrintEntity.getThrName()))
+                stockOrderPrintEntity.setProductName(stockOrderPrintEntity.getThrName());
+            if (StrUtil.isNotEmpty(stockOrderPrintEntity.getThrSpec()))
+                stockOrderPrintEntity.setSpec(stockOrderPrintEntity.getThrSpec());
+            if (StrUtil.isNotEmpty(stockOrderPrintEntity.getThrMeasname()))
+                stockOrderPrintEntity.setMeasname(stockOrderPrintEntity.getThrMeasname());
+            if (StrUtil.isNotEmpty(stockOrderPrintEntity.getThrRegisterNo()))
+                stockOrderPrintEntity.setZczbhhzbapzbh(stockOrderPrintEntity.getThrRegisterNo());
+        }
+
+    }
+
+
     @Resource
     UdiRelevanceService udiRelevanceService;
 

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

@@ -481,9 +481,12 @@ public class OrderDetailController {
             return ResultVOUtils.error(500, "单据不存在！");
         }
         BussinessTypeEntity bussinessTypeEntity = bussinessTypeService.findBTByAction(orderEntity.getAction());
-        if (bussinessTypeEntity.getOrderVisibleType() == 1 && orderEntity.getStatus() == 4) {
+
+        if ((bussinessTypeEntity.getOrderVisibleType() == 1 && orderEntity.getStatus() == 4) || filterErpOrderRequest.getShowType() == 1) {
             erpOrderEntities = transferSerList(erpOrderEntities, filterErpOrderRequest.getOrderId());
         }
+
+
         if (CollUtil.isEmpty(erpOrderEntities)) {
             return spsDirectClient.downloadOrderDetail(filterErpOrderRequest.getOrderId(), customerService.getUserId() + "");
         }

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

@@ -28,6 +28,7 @@ import com.glxp.api.admin.exception.JsonException;
 import com.glxp.api.admin.httpclient.SpsDirectClient;
 import com.glxp.api.admin.req.basic.CompanyProductRelevanceRequest;
 import com.glxp.api.admin.req.inout.*;
+import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest;
 import com.glxp.api.admin.req.inventory.FilterInvLinkDataRequest;
 import com.glxp.api.admin.res.PageSimpleResponse;
 import com.glxp.api.admin.res.basic.BussinessTypResponse;
@@ -35,6 +36,7 @@ import com.glxp.api.admin.res.basic.UdiRelevanceResponse;
 import com.glxp.api.admin.res.info.CompanyProductRelevanceResponse;
 import com.glxp.api.admin.res.inout.WarehouseResponse;
 import com.glxp.api.admin.res.inout.WarehouseUserResponse;
+import com.glxp.api.admin.res.inventory.InvBusUserResponse;
 import com.glxp.api.admin.service.auth.AuthAdminService;
 import com.glxp.api.admin.service.auth.CustomerService;
 import com.glxp.api.admin.service.basic.BasicUnitMaintainService;
@@ -1268,9 +1270,28 @@ public class WareHouseController {
         if (StrUtil.isBlank(code) || StrUtil.isBlank(userListJson))
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         List<AuthAdmin> userList = JSONUtil.toList(userListJson, AuthAdmin.class);
-//        if (CollUtil.isEmpty(userList)) {
+
-//            return ResultVOUtils.error(500, "用户列表不能为空");
+
-//        }
+        //获取用户关联单据类型信息
+        FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
+        filterInvBusUserRequest.setSubInvCode(code);
+        List<InvBusUserResponse> invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
+        Map<String, InvBusUserResponse> filteBusTypes = new HashMap<>();
+        for (InvBusUserResponse invBusUserEntity : invBusUserEntities) {
+            boolean isExit = false;
+            for (AuthAdmin authAdmin : userList) {
+                if (authAdmin.getId() == Long.parseLong(invBusUserEntity.getUserId())) {
+                    isExit = true;
+                    continue;
+                }
+            }
+            if (!isExit) {
+                filteBusTypes.put(invBusUserEntity.getUserId(), invBusUserEntity);
+            }
+        }
+        if (filteBusTypes.size() > 0) {
+            return ResultVOUtils.error(500, "请先移除用户已关联单据类型！");
+        }
 
         warehouseUserService.saveWarehouseUser(code, userList);
         InvSubWarehouseEntity invSubWarehouseEntity =
@@ -1286,6 +1307,33 @@ public class WareHouseController {
         String bussinessTypeJson = String.valueOf(params.get("bussinessTypes"));
         if (StrUtil.isBlank(code) || StrUtil.isBlank(bussinessTypeJson))
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
+
+        List<BussinessTypResponse> bussinessTypResponses = JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class);
+        FilterInvBusUserRequest filterInvBusUserRequest = new FilterInvBusUserRequest();
+        filterInvBusUserRequest.setSubInvCode(code);
+        List<InvBusUserResponse> invBusUserEntities = invBusUserService.filterJoinInvBusUser(filterInvBusUserRequest);
+        Map<String, InvBusUserResponse> filteBusTypes = new HashMap<>();
+        for (InvBusUserResponse invBusUserEntity : invBusUserEntities) {
+            boolean isExit = false;
+            for (BussinessTypResponse bussinessTypResponse : bussinessTypResponses) {
+                if (bussinessTypResponse.getAction().equals(invBusUserEntity.getScAction())) {
+                    isExit = true;
+                    continue;
+                }
+            }
+            if (!isExit) {
+                filteBusTypes.put(invBusUserEntity.getScAction(), invBusUserEntity);
+            }
+        }
+        if (filteBusTypes.size() > 0) {
+            String data = "";
+            for (InvBusUserResponse invBusUserResponse : filteBusTypes.values()) {
+                data = data + invBusUserResponse.getBillTypeName() + ",";
+            }
+            return ResultVOUtils.error(500, "单据类型：" + data + "已被用户关联，请先移除后修改！");
+        }
+
+
         warehouseBussinessTypeService.saveWarehouseBussinessType(code, JSONUtil.toList(bussinessTypeJson, BussinessTypResponse.class));
         InvSubWarehouseEntity invSubWarehouseEntity =
                 invSubWarehouseService.findByInvSubByCode(code);

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvSickTraceController.java

@@ -0,0 +1,43 @@
+package com.glxp.api.admin.controller.inventory;
+
+import cn.hutool.core.util.StrUtil;
+import com.github.pagehelper.PageInfo;
+import com.glxp.api.admin.annotation.AuthRuleAnnotation;
+import com.glxp.api.admin.entity.inout.OrderEntity;
+import com.glxp.api.admin.req.inout.OrderFilterRequest;
+import com.glxp.api.admin.req.inventory.FilterSickTraceRequest;
+import com.glxp.api.admin.res.PageSimpleResponse;
+import com.glxp.api.admin.service.inout.OrderService;
+import com.glxp.api.common.res.BaseResponse;
+import com.glxp.api.common.util.ResultVOUtils;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+public class InvSickTraceController {
+
+    @Resource
+    OrderService orderService;
+
+
+    @AuthRuleAnnotation("")
+    @GetMapping("spms/inv/sick/order/trace")
+    public BaseResponse filterSickTrace(FilterSickTraceRequest filterSickTraceRequest) {
+
+        if (StrUtil.isEmpty(filterSickTraceRequest.getSickAd())) {
+            return ResultVOUtils.error(500, "病人住院号不能为空！");
+        }
+        OrderFilterRequest orderFilterRequest = new OrderFilterRequest();
+        orderFilterRequest.setFromCorp(filterSickTraceRequest.getSickAd());
+        List<OrderEntity> orderEntityList = orderService.filterListOr(orderFilterRequest);
+        PageInfo<OrderEntity> pageInfo;
+        pageInfo = new PageInfo<>(orderEntityList);
+        PageSimpleResponse<OrderEntity> pageSimpleResponse = new PageSimpleResponse<>();
+        pageSimpleResponse.setTotal(pageInfo.getTotal());
+        pageSimpleResponse.setList(orderEntityList);
+        return ResultVOUtils.success(pageSimpleResponse);
+    }
+}

api-admin/src/main/java/com/glxp/api/admin/controller/inventory/InvWarehouseController.java

@@ -210,6 +210,22 @@ public class InvWarehouseController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
+
+        if (invWarehouseEntity.getLevel() == 1) {
+            FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
+            filterInvWarehouseRequest.setStatus(invWarehouseEntity.getStatus());
+            filterInvWarehouseRequest.setLevel(1);
+            List<InvWarehouseEntity> invWarehouseEntities = invWarehouseService.filterInvWarehouse(filterInvWarehouseRequest);
+            if (CollUtil.isNotEmpty(invWarehouseEntities)) {
+                return ResultVOUtils.error(500, "已存在相同类型的一级仓库，无法继续添加！");
+            }
+        }
+        InvWarehouseEntity invWarehouseEntity1 = invWarehouseService.selectByName(invWarehouseEntity.getName());
+        if (invWarehouseEntity1 != null) {
+            return ResultVOUtils.error(500, "已存在相同名称的仓库，无法继续添加！");
+        }
+
+
         if (invWarehouseEntity.getPid() == null || invWarehouseEntity.getPid() == 0) {//仓库
             invWarehouseEntity.setPid(0); // 默认设置
             FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
@@ -239,7 +255,7 @@ public class InvWarehouseController {
         InvSubWarehouseEntity invSubWarehouseEntity = new InvSubWarehouseEntity();
         invSubWarehouseEntity.setId(IdUtil.getSnowflake(6, 1).nextId() + "");
         invSubWarehouseEntity.setParentId(invWarehouseEntity.getCode());
-        invSubWarehouseEntity.setName(invWarehouseEntity.getName());
+        invSubWarehouseEntity.setName("第一分库");
         invSubWarehouseEntity.setCode(Integer.parseInt(invWarehouseEntity.getCode()) * 1000 + "");
         invSubWarehouseEntity.setDefaultInv(true);
         invSubWarehouseService.insertInvSubWarehouse(invSubWarehouseEntity);

api-admin/src/main/java/com/glxp/api/admin/dao/inventory/InvBusUserDao.java

@@ -2,6 +2,7 @@ package com.glxp.api.admin.dao.inventory;
 
 import com.glxp.api.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest;
+import com.glxp.api.admin.res.inventory.InvBusUserResponse;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -13,6 +14,8 @@ public interface InvBusUserDao {
 
     List<InvBusUserEntity> filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
 
+    List<InvBusUserResponse> filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
+
     boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity);
 
     boolean updateInvBusUser(InvBusUserEntity InvBusUserEntity);

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

@@ -15,7 +15,10 @@ public class BussinessChangeTypeEntity {
     private String remark;
     private String name;
     private Integer changeType;
-
+    private String defaultInv;
+    private String defaultSubInv;
+    private String defautInvName;
+    private String defautSubInvName;
 
     public Integer getBeforeTime() {
         if (beforeTime == null)

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

@@ -14,6 +14,7 @@ public class BussinessLocalTypeEntity {
     private String name;
     private String localAction;
     private String originAction;
+    private String originName;  //第三方单据类型名称
     private String mainAction;
     private String localName;
     private String remark;

api-admin/src/main/java/com/glxp/api/admin/entity/business/StockOrderPrintEntity.java

@@ -67,4 +67,12 @@ public class StockOrderPrintEntity extends StockOrderDetailEntity {
     private String basicPrductRemak7;
     private String basicPrductRemak8;
 
+
+    private String thrCode;
+    private String thrName;
+    private String thrMeasname;
+    private String thrSpec;
+    private String thrRegisterNo;
+    private String thrManufactory;
+
 }

api-admin/src/main/java/com/glxp/api/admin/entity/inout/FilterErpOrderRequest.java

@@ -21,5 +21,6 @@ public class FilterErpOrderRequest extends ListPageRequest {
     List<String> orderIds;
     private String goodsid;
     private String batchNo;
+    private int showType;
 
 }

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

@@ -28,4 +28,7 @@ public class CombineRequest {
     private boolean idSpliUdi;
     private String uuid;
 
+
+    private String ybbm;
+    private String sptm;
 }

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

@@ -8,4 +8,5 @@ public class FilterInvBusTypeRequest extends ListPageRequest {
     private String lastUpdateTime;
     private Integer id;
     private String code;
+    private String action;
 }

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

@@ -22,6 +22,7 @@ public class OrderFilterRequest extends ListPageRequest {
     private Integer process;
     private String unionStatus;
     private String fromCorpId;
+    private String fromCorp;
 
     private Integer receiveStatus;
     private Integer statusOrOne;

api-admin/src/main/java/com/glxp/api/admin/req/inventory/FilterSickTraceRequest.java

@@ -0,0 +1,9 @@
+package com.glxp.api.admin.req.inventory;
+
+import lombok.Data;
+
+@Data
+public class FilterSickTraceRequest {
+
+    private String sickAd;  //病人住院号
+}

api-admin/src/main/java/com/glxp/api/admin/req/thrsys/FilterThrProductsRequest.java

@@ -27,5 +27,7 @@ public class FilterThrProductsRequest extends ListPageRequest {
     private Integer checkStatus;
     private String customerId;
     private String supId;
+    private Long id;
+
 
 }

api-admin/src/main/java/com/glxp/api/admin/res/info/CompanyProductRelevanceResponse.java

@@ -73,5 +73,13 @@ public class CompanyProductRelevanceResponse {
 
     //产品代理商
     private String cpdls;
+    private String basicPrductRemak1;
+    private String basicPrductRemak2;
+    private String basicPrductRemak3;
+    private String basicPrductRemak4;
+    private String basicPrductRemak5;
+    private String basicPrductRemak6;
+    private String basicPrductRemak7;
+    private String basicPrductRemak8;
 
 }

api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvBusUserResponse.java

@@ -0,0 +1,15 @@
+package com.glxp.api.admin.res.inventory;
+
+import lombok.Data;
+
+@Data
+public class InvBusUserResponse {
+    private Integer id;
+    private String userId;
+    private String subInvCode;
+    private String scAction;
+    private String billTypeName;
+    private String remark;
+
+
+}

api-admin/src/main/java/com/glxp/api/admin/res/inventory/InvProductThirdResponse.java

@@ -0,0 +1,44 @@
+package com.glxp.api.admin.res.inventory;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@NoArgsConstructor
+@Data
+public class InvProductThirdResponse {
+
+
+    @JsonProperty("id")
+    private Integer id;
+    @JsonProperty("productName")
+    private String productName;
+    @JsonProperty("diCode")
+    private String diCode;
+    @JsonProperty("spec")
+    private String spec;
+    @JsonProperty("batchNo")
+    private String batchNo;
+    @JsonProperty("productionDate")
+    private String productionDate;
+    @JsonProperty("expireDate")
+    private String expireDate;
+    @JsonProperty("registerCompany ")
+    private String registerCompany;
+    @JsonProperty("registerCert")
+    private String registerCert;
+    @JsonProperty("inCount")
+    private Integer inCount;
+    @JsonProperty("outCount")
+    private Integer outCount;
+    @JsonProperty("supName")
+    private String supName;
+    @JsonProperty("invStorageCode")
+    private String invStorageCode;
+    @JsonProperty("invStorageName")
+    private String invStorageName;
+    @JsonProperty("invSubStorageName")
+    private String invSubStorageName;
+    @JsonProperty("invWarehouseCode")
+    private String invWarehouseCode;
+}

api-admin/src/main/java/com/glxp/api/admin/service/basic/SyncUdiService.java

@@ -39,7 +39,7 @@ public class SyncUdiService {
                 (productInfoFilterRequest.getZczbhhzbapzbh() == null || productInfoFilterRequest.getZczbhhzbapzbh().equals("")) &&
                 (productInfoFilterRequest.getDeviceRecordKey() == null || productInfoFilterRequest.getDeviceRecordKey().equals(""))
         ) {
-            return ResultVOUtils.error(500, "参数不能为空！");
+            return ResultVOUtils.error(500, "查询条件不能为空！");
         }
 
         if (StrUtil.isEmpty(productInfoFilterRequest.getYlqxzcrbarmc()) &&

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

@@ -130,7 +130,7 @@ public class BussinessLocalTypeServiceImpl implements BussinessLocalTypeService
         bussinessLocalTypeFilterRequest.setAction(action);
         List<BussinessLocalTypeEntity> data = bussinessLocalTypeDao.filterAllList(bussinessLocalTypeFilterRequest);
         if (CollUtil.isNotEmpty(data)) {
-            data.get(0);
+            return data.get(0);
         }
         return null;
     }

api-admin/src/main/java/com/glxp/api/admin/service/business/impl/StockOrderServiceImpl.java

@@ -27,6 +27,7 @@ import com.glxp.api.admin.entity.business.StockOrderDetailEntity;
 import com.glxp.api.admin.entity.business.StockOrderEntity;
 import com.glxp.api.admin.entity.business.StockOrderPrintEntity;
 import com.glxp.api.admin.entity.inout.OrderEntity;
+import com.glxp.api.admin.entity.inout.WarehouseEntity;
 import com.glxp.api.admin.entity.inventory.InvProductDetailEntity;
 import com.glxp.api.admin.entity.inventory.InvProductEntity;
 import com.glxp.api.admin.httpclient.req.UdiwmsOrderRequest;
@@ -41,6 +42,7 @@ import com.glxp.api.admin.res.business.StockOrderDetailEntityVo;
 import com.glxp.api.admin.res.business.StockOrderExportResponse;
 import com.glxp.api.admin.service.basic.BussinessTypeService;
 import com.glxp.api.admin.service.business.StockOrderService;
+import com.glxp.api.admin.service.inout.CodesTempService;
 import com.glxp.api.admin.util.BusTypeCheckUtils;
 import com.glxp.api.admin.util.DateUtil;
 import com.glxp.api.admin.util.HttpOkClient;
@@ -78,7 +80,8 @@ public class StockOrderServiceImpl implements StockOrderService {
     private InvPreInProductDao invPreInProductDao;
     @Resource
     private CodesDao codesDao;
-
+    @Resource
+    private CodesTempService codesTempService;
 
     @Resource
     private BasicThirdSysBusApiDao thirdSysBusApiDao;
@@ -86,6 +89,7 @@ public class StockOrderServiceImpl implements StockOrderService {
     private BasicThirdSysDao basicThirdSysDao;
     @Resource
     private BasicThirdSysBusApiDao basicThirdSysBusApiDao;
+
     @Resource
     BussinessTypeService bussinessTypeService;
 
@@ -313,6 +317,11 @@ public class StockOrderServiceImpl implements StockOrderService {
                 stockOrderDao.deleteById(stockOrderEntity.getId());
                 orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                 orderDao.updateOrder(orderEntity);
+                List<WarehouseEntity> warehouseEntityList = codesDao.findByReceiptId(orderEntity.getId());
+                if (CollUtil.isNotEmpty(warehouseEntityList)) {
+                    codesTempService.insertCodesTemp(warehouseEntityList);
+                    codesDao.deleteByOrderId(orderEntity.getId());
+                }
             }
 
 
@@ -330,38 +339,29 @@ public class StockOrderServiceImpl implements StockOrderService {
                 FilterInvProductDetailRequest filterInvProductDetailRequest = new FilterInvProductDetailRequest();
                 filterInvProductDetailRequest.setOrderIdFk(orderEntity.getId());
                 List<InvProductDetailEntity> invProductDetailEntities = invPreInProductDetailDao.filterInvProductDetail(filterInvProductDetailRequest);
-
+                List<InvProductEntity> invPreInProductList = new ArrayList<>();
-                Map<String, List<InvProductDetailEntity>> invPreInProductDetailMap = invProductDetailEntities
+                for (InvProductDetailEntity invProductDetailEntity : invProductDetailEntities) {
-                        .stream()
-                        .collect(Collectors.groupingBy(InvProductDetailEntity::getProductIdFk));
-
-                List<InvProductEntity> invPreInProductList = new ArrayList<>(invPreInProductDetailMap.keySet().size());
-
-                for (String productId : invPreInProductDetailMap.keySet()) {
-                    List<InvProductDetailEntity> detailList = invPreInProductDetailMap.get(productId);
                     FilterInvProductRequest filterInvProductRequest = new FilterInvProductRequest();
-                    filterInvProductRequest.setRelIdFk(productId);
+                    filterInvProductRequest.setRelIdFk(invProductDetailEntity.getProductIdFk());
-                    filterInvProductRequest.setSupId(detailList.get(0).getSupId());
+                    filterInvProductRequest.setSupId(invProductDetailEntity.getSupId());
-                    filterInvProductRequest.setInvWarehouseCode(detailList.get(0).getInvWarehouseCode());
+                    filterInvProductRequest.setInvWarehouseCode(invProductDetailEntity.getInvWarehouseCode());
-                    filterInvProductRequest.setInvStorageCode(detailList.get(0).getInvStorageCode());
+                    filterInvProductRequest.setInvStorageCode(invProductDetailEntity.getInvStorageCode());
-                    if (StrUtil.isBlank(detailList.get(0).getBatchNo())) {
+                    if (StrUtil.isBlank(invProductDetailEntity.getBatchNo())) {
                         filterInvProductRequest.setBatchNo("empty");
                     } else {
-                        filterInvProductRequest.setBatchNo(detailList.get(0).getBatchNo());
+                        filterInvProductRequest.setBatchNo(invProductDetailEntity.getBatchNo());
                     }
                     List<InvProductEntity> invProductEntities = invPreInProductDao.filterInvProduct(filterInvProductRequest);
-                    InvProductEntity invProductEntity = invProductEntities.get(0);
+                    if (CollUtil.isNotEmpty(invProductEntities) && invProductEntities.size() > 0) {
-                    detailList.forEach(invProductDetailEntity -> {
+                        InvProductEntity invProductEntity = invProductEntities.get(0);
                         calculateInvCount(invProductEntity, invProductDetailEntity);
-                    });
+                        invPreInProductList.add(invProductEntity);
-
+                    } else {
-                    invPreInProductList.add(invProductEntity);
+                        return false;
+                    }
                 }
-
                 //删除库存详情
                 invPreInProductDetailDao.deleteByOrderId(orderEntity.getId());
-                //删除码详情
-                codesDao.deleteByOrderId(orderEntity.getId());
                 //更新库存
                 for (InvProductEntity invProductEntity : invPreInProductList) {
                     //查询库存码详情，如果库存码详情为空，则删除此库存
@@ -446,10 +446,14 @@ public class StockOrderServiceImpl implements StockOrderService {
                     stockOrderDao.deleteById(stockOrderEntity.getId());
                     orderEntity.setStatus(ConstantStatus.ORDER_STATUS_PROCESS);
                     orderDao.updateOrder(orderEntity);
+                    List<WarehouseEntity> warehouseEntityList = codesDao.findByReceiptId(orderEntity.getId());
+                    if (CollUtil.isNotEmpty(warehouseEntityList)) {
+                        codesTempService.insertCodesTemp(warehouseEntityList);
+                        codesDao.deleteByOrderId(orderEntity.getId());
+                    }
                 }
             }
 
-
         }
 
         //更新业务单据数据

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

@@ -52,6 +52,10 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
 
     @Override
     public void saveWarehouseBussinessType(String code, List<BussinessTypResponse> bussinessTypResponseList) {
+
+        //删除旧数据
+        warehouseBussinessTypeDao.deleteByCode(code);
+
         if (CollUtil.isNotEmpty(bussinessTypResponseList)) {
             List<WarehouseBussinessTypeEntity> warehouseBussinessTypeEntities = new ArrayList<>(bussinessTypResponseList.size());
             bussinessTypResponseList.forEach(bussinessTypeEntity -> {
@@ -61,8 +65,7 @@ public class WarehouseBussinessTypeServiceImpl implements WarehouseBussinessType
                 entity.setName(bussinessTypeEntity.getName());
                 warehouseBussinessTypeEntities.add(entity);
             });
-            //删除旧数据
+
-            warehouseBussinessTypeDao.deleteByCode(code);
             //加入新数据
             warehouseBussinessTypeDao.batchInsert(warehouseBussinessTypeEntities);
         }

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

@@ -3,6 +3,7 @@ package com.glxp.api.admin.service.inventory;
 
 import com.glxp.api.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest;
+import com.glxp.api.admin.res.inventory.InvBusUserResponse;
 
 import java.util.List;
 
@@ -10,8 +11,9 @@ public interface InvBusUserService {
 
     List<InvBusUserEntity> filterInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
 
-    List<InvBusUserEntity> selectByUnion(String userId, String subInvCode);
+    List<InvBusUserResponse> filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest);
 
+    List<InvBusUserEntity> selectByUnion(String userId, String subInvCode);
 
     boolean insertInvBusUser(InvBusUserEntity InvBusUserEntity);
 

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

@@ -29,6 +29,8 @@ public interface InvWarehouseService {
 
     InvWarehouseEntity selectByCode(String code);
 
+    InvWarehouseEntity selectByName(String name);
+
     boolean deleteById(String id);
 
     /**

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

@@ -5,6 +5,7 @@ import com.github.pagehelper.PageHelper;
 import com.glxp.api.admin.dao.inventory.InvBusUserDao;
 import com.glxp.api.admin.entity.inventory.InvBusUserEntity;
 import com.glxp.api.admin.req.inventory.FilterInvBusUserRequest;
+import com.glxp.api.admin.res.inventory.InvBusUserResponse;
 import com.glxp.api.admin.service.inventory.InvBusUserService;
 import org.springframework.stereotype.Service;
 
@@ -31,6 +32,19 @@ public class InvBusUserServiceImpl implements InvBusUserService {
         return invBusUserDao.filterInvBusUser(filterInvBusUserRequest);
     }
 
+
+    @Override
+    public List<InvBusUserResponse> filterJoinInvBusUser(FilterInvBusUserRequest filterInvBusUserRequest) {
+        if (filterInvBusUserRequest == null) {
+            return Collections.emptyList();
+        }
+        if (filterInvBusUserRequest.getPage() != null) {
+            int offset = (filterInvBusUserRequest.getPage() - 1) * filterInvBusUserRequest.getLimit();
+            PageHelper.offsetPage(offset, filterInvBusUserRequest.getLimit());
+        }
+        return invBusUserDao.filterJoinInvBusUser(filterInvBusUserRequest);
+    }
+
     @Override
     public List<InvBusUserEntity> selectByUnion(String userId, String subInvCode) {
 

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

@@ -113,6 +113,16 @@ public class InvWarehouseServiceImpl implements InvWarehouseService {
         return null;
     }
 
+    @Override
+    public InvWarehouseEntity selectByName(String name) {
+        FilterInvWarehouseRequest filterInvWarehouseRequest = new FilterInvWarehouseRequest();
+        filterInvWarehouseRequest.setName(name);
+        List<InvWarehouseEntity> invWarehouseEntities = invWarehouseDao.filterInvWarehouse(filterInvWarehouseRequest);
+        if (invWarehouseEntities != null && invWarehouseEntities.size() > 0)
+            return invWarehouseEntities.get(0);
+        return null;
+    }
+
     @Override
     public boolean deleteById(String id) {
         return invWarehouseDao.deleteById(id);

api-admin/src/main/java/com/glxp/api/admin/service/thrsys/ThrProductsService.java

@@ -14,6 +14,8 @@ public interface ThrProductsService {
 
     List<ThrProductsEntity> selectThrProducts(FilterThrProductsRequest filterThrProductsRequest);
 
+    Boolean isExit(String code, String thirdIdFk);
+
     ThrProductsEntity selectById(String id);
 
     boolean insertOrUpdateSelective(ThrProductsEntity thrProductsEntity);

api-admin/src/main/java/com/glxp/api/admin/service/thrsys/impl/ThrProductsServiceImpl.java

@@ -58,6 +58,19 @@ public class ThrProductsServiceImpl implements ThrProductsService {
         return data;
     }
 
+    @Override
+    public Boolean isExit(String code, String thirdIdFk) {
+        FilterThrProductsRequest filterThrProductsRequest = new FilterThrProductsRequest();
+        filterThrProductsRequest.setThirdSysFk(thirdIdFk);
+        filterThrProductsRequest.setCode(code);
+        List<ThrProductsEntity> data = thrProductsDao.selectThrProducts(filterThrProductsRequest);
+        if (CollUtil.isNotEmpty(data)) {
+            return true;
+        }
+        return false;
+    }
+
+
     @Override
     public ThrProductsEntity selectById(String id) {
         return thrProductsDao.selectById(id);

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

@@ -708,9 +708,9 @@ public class InvProductsTrService {
             outOrder.setFromCorpId(corpName);
             outOrder.setFromCorp(temps.get(0).getFromCorp());
 
-            BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction());
+//            BussinessTypeEntity originBT = bussinessTypeService.findBTByAction(orderEntity.getAction());
-            if (StrUtil.isNotEmpty(originBT.getDefaultSubInv())) {
+            if (StrUtil.isNotEmpty(bussinessChangeTypeEntity.getDefaultSubInv())) {
-                outOrder.setFromSubInvCode(originBT.getDefaultSubInv());
+                outOrder.setFromSubInvCode(bussinessChangeTypeEntity.getDefaultSubInv());
             }
 
             outOrder.setCorpOrderId(CustomUtil.getId() + "x");

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

@@ -5,10 +5,12 @@
 
     <select id="findByAction" parameterType="Map"
             resultType="com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity">
-        SELECT *
+        SELECT basic_bustype_pre.*,basic_bussiness_type.name,inv_warehouse.`name` defautInvName,inv_warehouse_sub.`name` defautSubInvName
         FROM basic_bustype_pre
                  LEFT JOIN basic_bussiness_type
                            on basic_bustype_pre.scAction = basic_bussiness_type.action
+                 left join inv_warehouse on basic_bustype_pre.defaultInv = inv_warehouse.code
+                 left join inv_warehouse_sub on basic_bustype_pre.defaultSubInv = inv_warehouse_sub.code
         where basic_bustype_pre.`action` = #{action}
     </select>
 
@@ -17,12 +19,13 @@
             parameterType="com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity">
         insert
         INTO basic_bustype_pre
-            (action, scAction, `index`, remark, beforeTime, intro, changeType)
+        (action, scAction, `index`, remark, beforeTime, intro, changeType, defaultInv, defaultSubInv)
         values (#{action},
                 #{scAction},
                 #{index},
                 #{remark},
-                #{beforeTime}, #{intro}, #{changeType})
+                #{beforeTime}, #{intro}, #{changeType},#{defaultInv},#{defaultSubInv})
+
     </insert>
 
     <update id="updateBusChangeType" parameterType="com.glxp.api.admin.entity.basic.BussinessChangeTypeEntity">
@@ -35,6 +38,8 @@
             <if test="remark != null">remark = #{remark},</if>
             <if test="intro != null">intro = #{intro},</if>
             <if test="changeType != null">changeType = #{changeType},</if>
+            <if test="defaultInv != null">defaultInv = #{defaultInv},</if>
+            <if test="defaultSubInv != null">defaultSubInv = #{defaultSubInv},</if>
 
         </trim>
         WHERE id = #{id}

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

@@ -5,8 +5,10 @@
 
     <select id="filterList" parameterType="com.glxp.api.admin.req.basic.BussinessLocalTypeFilterRequest"
             resultType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
-        SELECT basic_bustype_local.* ,basic_bussiness_type.mainAction from basic_bustype_local LEFT JOIN
+        SELECT basic_bustype_local.* ,basic_bussiness_type.mainAction ,basic_bustype_origin.name originName from
-        basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action
+        basic_bustype_local
+        LEFT JOIN basic_bussiness_type on basic_bussiness_type.localAction = basic_bustype_local.action
+        LEFT JOIN basic_bustype_origin on basic_bustype_local.originAction = basic_bustype_origin.action
         <where>
             <if test="name != ''and name != null">
                 AND basic_bustype_local.name LIKE concat('%',#{name},'%')
@@ -21,7 +23,7 @@
                 AND spUse =#{spUse}
             </if>
         </where>
-        order by updateTime desc
+        order by basic_bustype_local.updateTime desc
 
     </select>
 
@@ -75,8 +77,9 @@
         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.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck
+        basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv,
-        ,  basic_bustype_local.supplementAll,basic_bussiness_type.orderVisibleType
+        basic_bussiness_type.codeFillCheck
+        , basic_bustype_local.supplementAll,basic_bussiness_type.orderVisibleType
         FROM basic_bustype_local
         inner join basic_bussiness_type
         on basic_bustype_local.action = basic_bussiness_type.localAction
@@ -91,7 +94,7 @@
                 AND basic_bussiness_type.enable =#{enabled}
             </if>
             <if test="spUse != ''and spUse != null">
-                AND  basic_bustype_local.spUse =#{spUse}
+                AND basic_bustype_local.spUse =#{spUse}
             </if>
         </where>
         group by basic_bussiness_type.action
@@ -130,8 +133,10 @@
         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.defaultUnit,basic_bussiness_type.genUnit,basic_bustype_origin.action
-        thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.prefix,basic_bustype_local.prefix localPrefix,preIn,
+        thirdAction,basic_bustype_origin.thirdSys,basic_bussiness_type.prefix,basic_bustype_local.prefix
-        basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv, basic_bussiness_type.codeFillCheck,supplementAll
+        localPrefix,preIn,
+        basic_bussiness_type.ullageFill, basic_bussiness_type.scanPreIn, basic_bussiness_type.vailInv,
+        basic_bussiness_type.codeFillCheck,supplementAll
         FROM basic_bustype_local
         inner join basic_bussiness_type on basic_bustype_local.action = basic_bussiness_type.localAction
         INNER JOIN inv_warehouse_bussiness_type on basic_bussiness_type.action = inv_warehouse_bussiness_type.action
@@ -190,11 +195,22 @@
 
     <insert id="insertBussinessType" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
-        replace INTO basic_bustype_local
+        replace
+        INTO basic_bustype_local
             (action, name, remark, originAction, advanceType, changeEnable, spUse,updateTime,prefix,preIn,supplementAll)
-        values (#{action},
+        values (
+        #{action},
         #{name},
-        #{remark}, #{originAction}, #{advanceType}, #{changeEnable}, #{spUse},#{updateTime},#{prefix},#{preIn},#{supplementAll})
+        #{remark},
+        #{originAction},
+        #{advanceType},
+        #{changeEnable},
+        #{spUse},
+        #{updateTime},
+        #{prefix},
+        #{preIn},
+        #{supplementAll}
+        )
     </insert>
 
     <update id="updateBusLocalType" parameterType="com.glxp.api.admin.entity.basic.BussinessLocalTypeEntity">
@@ -233,13 +249,15 @@
         select action, name
         from basic_bustype_local
         where action not in (
-                select code
+            select code
-                from basic_third_sys_bus_api
+            from basic_third_sys_bus_api
-                );
+            );
     </select>
 
     <select id="selectPreInByOrderType" resultType="java.lang.Boolean">
-        select preIn from basic_bustype_local where action = (
+        select preIn
+        from basic_bustype_local
+        where action = (
             select localAction from basic_bussiness_type where basic_bussiness_type.action = #{action}
             )
     </select>

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

@@ -53,6 +53,10 @@
         basic_products.scbssfbhscrq,
         basic_products.scbssfbhsxrq,basic_products.cpms,basic_products.originUuid,company_product_relevance.price
         ,basic_products.spmc, basic_products.cpdls
+        ,basic_products.basicPrductRemak1
+        ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
+        ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8
+
         FROM company_product_relevance
         inner JOIN basic_udirel
         ON company_product_relevance.udiRlIdFk = basic_udirel.id

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

@@ -29,6 +29,9 @@
         basic_products.scbssfbhscrq,
         basic_products.cpdls,
         basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid
+        ,basic_products.basicPrductRemak1
+        ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
+        ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8
         FROM basic_udirel
         inner JOIN basic_products
         ON basic_products.uuid = basic_udirel.uuid
@@ -116,6 +119,9 @@
         basic_products.cpdls,
         basic_products.scbssfbhscrq,basic_corp.name companyName,
         basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,company_product_relevance.unitFk,basic_products.originUuid
+        ,basic_products.basicPrductRemak1
+        ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
+        ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8
         FROM basic_udirel
         inner JOIN basic_products
         ON basic_products.uuid = basic_udirel.uuid
@@ -205,7 +211,10 @@
         basic_products.scbssfbhxlh,
         basic_products.scbssfbhscrq,
         basic_products.cpdls,
-        basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid,basic_products.spmc
+        basic_products.scbssfbhsxrq,basic_products.cpms,basic_udirel.supName,basic_products.originUuid,basic_products.spmc,
+        basic_products.basicPrductRemak1
+        ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
+        ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8
         FROM basic_products
         right JOIN basic_udirel
         ON basic_products.uuid = basic_udirel.uuid

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

@@ -288,15 +288,19 @@
         stock_order_detail.price,inv_warehouse.name locInv,inv_warehouse_sub.name subInv,basic_products.spmc,
         basic_products.cpms,basic_udirel.measname,auth_dept.`name` deptName,basic_products.basicPrductRemak1
         ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
-        ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8
+        ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8,
+        thr_products.code thrCode,thr_products.name thrName,thr_products.measname thrMeasname,thr_products.spec thrSpec,
+        thr_products.registerNo thrRegisterNo,thr_products.manufactory thrManufactory
+
         FROM stock_order
         INNER JOIN stock_order_detail on stock_order.id = stock_order_detail.orderIdFk
         LEFT JOIN inv_warehouse ON stock_order.locStorageCode = inv_warehouse.`code`
-        LEFT JOIN inv_warehouse_sub ON inv_warehouse_sub.parentId = inv_warehouse.`code`
+        LEFT JOIN inv_warehouse_sub ON stock_order.invWarehouseCode = inv_warehouse_sub.`code`
         LEFT JOIN inv_warehouse_user on inv_warehouse_sub.code = inv_warehouse_user.`code`
         left join basic_udirel on stock_order_detail.productId = basic_udirel.id
         left JOIN basic_products on basic_products.uuid = basic_udirel.uuid
         left join auth_dept on stock_order.dept = auth_dept.`code`
+        left join thr_products on basic_udirel.mainId = thr_products.`code`
         <where>
             <if test="id != '' and id!=null">
                 and stock_order.id =#{id}
@@ -332,12 +336,15 @@
         inv_warehouse.name locInv, inv_warehouse_sub.name subInv, basic_products.spmc,
         basic_products.cpms,io_codes.nameCode,io_codes.relId,basic_products.basicPrductRemak1
         ,basic_products.basicPrductRemak2,basic_products.basicPrductRemak3,basic_products.basicPrductRemak4,basic_products.basicPrductRemak5,basic_products.basicPrductRemak6
-        ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8
+        ,basic_products.basicPrductRemak7,basic_products.basicPrductRemak8,
+        thr_products.code thrCode,thr_products.name thrName,thr_products.measname thrMeasname,thr_products.spec thrSpec,
+        thr_products.registerNo thrRegisterNo,thr_products.manufactory thrManufactory
         from io_codes
         INNER JOIN basic_udirel on io_codes.relId = basic_udirel.id
         INNER JOIN basic_products on basic_products.uuid = basic_udirel.uuid
         LEFT JOIN inv_warehouse ON io_codes.locStorageCode = inv_warehouse.`code`
         left join inv_warehouse_sub on io_codes.invWarehouseCode = inv_warehouse_sub.code
+        left join thr_products on basic_udirel.mainId = thr_products.`code`
         <where>
             <if test="orderId != '' and orderId !=null">
                 and io_codes.orderId =#{orderId}

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

@@ -283,6 +283,9 @@
             <if test="invWarehouseCode != '' and invWarehouseCode!=null">
                 and invWarehouseCode =#{invWarehouseCode}
             </if>
+            <if test="fromCorp != '' and fromCorp!=null">
+                and fromCorp =#{fromCorp}
+            </if>
 
         </where>
         group by io_order.id

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

@@ -253,6 +253,9 @@
             <if test="code != '' and code != null">
                 AND code = #{code}
             </if>
+            <if test="action != '' and action != null">
+                AND `action` = #{action}
+            </if>
         </where>
 
     </select>

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

@@ -22,6 +22,26 @@
 
     </select>
 
+    <select id="filterJoinInvBusUser" parameterType="com.glxp.api.admin.req.inventory.FilterInvBusUserRequest"
+            resultType="com.glxp.api.admin.res.inventory.InvBusUserResponse">
+        select inv_bustype_user.*,basic_bussiness_type.name billTypeName
+        FROM inv_bustype_user left join basic_bussiness_type on inv_bustype_user.scAction = basic_bussiness_type.action
+        <where>
+            <if test="userId != '' and userId != null">
+                AND userId = #{userId}
+            </if>
+            <if test="subInvCode != '' and subInvCode != null">
+                AND subInvCode = #{subInvCode}
+            </if>
+            <if test="scAction != '' and scAction != null">
+                AND scAction = #{scAction}
+            </if>
+
+        </where>
+        group by inv_bustype_user.id
+
+    </select>
+
 
     <insert id="insertInvBusUser" keyProperty="id"
             parameterType="com.glxp.api.admin.entity.inventory.InvBusUserEntity">