修改bug

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/CustomerController.java

@@ -107,6 +107,7 @@ public class CustomerController {
         }
         CustomerInfoEntity customerInfoEntity = new CustomerInfoEntity();
         BeanUtils.copyProperties(customerDetailEntity, customerInfoEntity);
+        customerInfoEntity.setCustomerId((Long.valueOf(customerDetailEntity.getCustomerId())));
         boolean b = customerInfoService.updateCustomerInfo(customerInfoEntity);
         if (customerDetailEntity.getUserFlag() != null) {
             UpdateUserflagBean userflagBean = new UpdateUserflagBean();

api-admin/src/main/java/com/glxp/sale/admin/controller/auth/RegisterController.java

@@ -325,7 +325,6 @@ public class RegisterController {
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-
         Long customerId = 0L;
         UserRegisterEntity userRegisterEntity = userRegisterService.selectById(registerCheckRequest.getId());
         //判断是否选择供应商

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

@@ -90,6 +90,10 @@ public class BussinessLocalTypeController {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
         String customerId = getCustomerId();
+        if(bussinessTypeFilterRequest.getType()==1){
+           Integer userId=customerService.getUserId();
+           bussinessTypeFilterRequest.setUserId(userId);
+        }
 
         if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
             bussinessTypeFilterRequest.setSpUse(true);

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

@@ -41,6 +41,9 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.InputStream;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 
@@ -97,6 +100,11 @@ public class BussinessTypeController {
         if (!customerId.equals(Constant.SYSTEM_CUSTOMER_ID)) {
             bussinessTypeFilterRequest.setSpUse(true);
         }
+        if(StrUtil.isNotEmpty(bussinessTypeFilterRequest.getIds())){
+            List<String> idList = new ArrayList<>(Arrays.asList(bussinessTypeFilterRequest.getIds().split(",")));
+            bussinessTypeFilterRequest.setActionList(idList);
+        }
+
 
         if (!StrUtil.isEmpty(bussinessTypeFilterRequest.getFilterAction())) {
             BussinessLocalTypeEntity bussinessLocalTypeEntity = bussinessLocalTypeService.findBTByAction(bussinessTypeFilterRequest.getFilterAction());

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

@@ -1219,7 +1219,7 @@ public class WareHouseController {
     /**
      * 根据仓位码获取关联用户数据
      *
-     * @param code
+     * @param
      * @return
      */
     @AuthRuleAnnotation("")
@@ -1378,6 +1378,13 @@ public class WareHouseController {
         if (null == id)
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL);
         WarehouseBussinessTypeEntity warehouseBussinessTypeEntity = warehouseBussinessTypeService.selectById(id);
+        FilterInvBusUserRequest filterInvBusUserRequest=new FilterInvBusUserRequest();
+        filterInvBusUserRequest.setScAction(warehouseBussinessTypeEntity.getAction());
+        filterInvBusUserRequest.setSubInvCode(warehouseBussinessTypeEntity.getCode());
+        List<InvBusUserEntity> invBusUserEntityList=invBusUserService.filterInvBusUser(filterInvBusUserRequest);
+        if(invBusUserEntityList.size()>0){
+            return  ResultVOUtils.error(999,"有用户关联该单据请先移除再进行删除！");
+        }
 
         InvSubWarehouseEntity invSubWarehouseEntity =
                 invSubWarehouseService.findByInvSubByCode(warehouseBussinessTypeEntity.getCode());

api-admin/src/main/java/com/glxp/sale/admin/controller/purechase/SupManufacturerController.java

@@ -90,9 +90,9 @@ public class SupManufacturerController {
     public BaseResponse addCompany(@RequestBody SupManufacturerEntity supManufacturerEntity) {
 
         String customerId = getCustomerId();
-        if (!customerId.equals("110")) {
-            supManufacturerEntity.setCustomerId(customerId);
-        }
+
+        supManufacturerEntity.setCustomerId(customerId);
+
 
         supManufacturerEntity.setCreateTime(new Date());
         supManufacturerEntity.setUpdateTime(new Date());

api-admin/src/main/java/com/glxp/sale/admin/entity/info/CompanyEntity.java

@@ -28,6 +28,7 @@ public class CompanyEntity {
     private String entId;
     private int networkType;
     private int certIdFk;
+    private String auditComment;
 
     private String parentCompany;
     private String parentIdFk;

api-admin/src/main/java/com/glxp/sale/admin/entity/thrsys/ThrOrderEntity.java

@@ -37,6 +37,8 @@ public class ThrOrderEntity {
 
     private String locStorageCode;
     private String invWarehouseCode;
+    private String invWarehouseName;
+    private String fromSubInvName;
     private int editStatus;
     private int thirdPartyDate;
     private int allocateStatus;     //1:已配货；0：未配货

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

@@ -7,6 +7,7 @@ import lombok.Data;
 public class BasicBusTypeChangeRequest extends ListPageRequest {
 
     private String originAction;
+    private String originName;
     private Boolean enable;
     private Integer type;
     private String lastUpdateTime;

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

@@ -19,4 +19,5 @@ public class BussinessLocalTypeFilterRequest extends ListPageRequest {
     private String code;
     private Integer userId;
     private String lastUpdateTime;
+    private Integer type;
 }

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

@@ -3,6 +3,8 @@ package com.glxp.sale.admin.req.basic;
 import com.glxp.sale.admin.req.ListPageRequest;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class BussinessTypeFilterRequest extends ListPageRequest {
 
@@ -22,4 +24,6 @@ public class BussinessTypeFilterRequest extends ListPageRequest {
     private String locSubInvCode;
     private String lastUpdateTime;
     private String code;
+    private String ids;
+    private List<String> actionList;
 }

api-admin/src/main/java/com/glxp/sale/admin/res/inout/ErpOrderResponse.java

@@ -36,6 +36,60 @@ public class ErpOrderResponse {
     private String remark2; //备注2
     private String remark3; //备注3
     private String billTypeName;
+    private String invWarehouseName;
+    private String fromSubInvName;
+
+    @Override
+    public String toString() {
+        return "ErpOrderResponse{" +
+                "id=" + id +
+                ", billNo='" + billNo + '\'' +
+                ", billdate='" + billdate + '\'' +
+                ", corpId='" + corpId + '\'' +
+                ", corpName='" + corpName + '\'' +
+                ", billType='" + billType + '\'' +
+                ", signFlag=" + signFlag +
+                ", billFlag='" + billFlag + '\'' +
+                ", unitIdFk='" + unitIdFk + '\'' +
+                ", customerId='" + customerId + '\'' +
+                ", originType='" + originType + '\'' +
+                ", locStorageCode='" + locStorageCode + '\'' +
+                ", invWarehouseCode='" + invWarehouseCode + '\'' +
+                ", fromSubInvCode='" + fromSubInvCode + '\'' +
+                ", thirdSysFk='" + thirdSysFk + '\'' +
+                ", subErpOrders=" + subErpOrders +
+                ", startDate='" + startDate + '\'' +
+                ", endDate='" + endDate + '\'' +
+                ", createUser='" + createUser + '\'' +
+                ", reviewUser='" + reviewUser + '\'' +
+                ", address='" + address + '\'' +
+                ", linkMan='" + linkMan + '\'' +
+                ", linkTel='" + linkTel + '\'' +
+                ", remark='" + remark + '\'' +
+                ", remark1='" + remark1 + '\'' +
+                ", remark2='" + remark2 + '\'' +
+                ", remark3='" + remark3 + '\'' +
+                ", billTypeName='" + billTypeName + '\'' +
+                ", invWarehouseName='" + invWarehouseName + '\'' +
+                ", fromSubInvName='" + fromSubInvName + '\'' +
+                '}';
+    }
+
+    public String getInvWarehouseName() {
+        return invWarehouseName;
+    }
+
+    public void setInvWarehouseName(String invWarehouseName) {
+        this.invWarehouseName = invWarehouseName;
+    }
+
+    public String getFromSubInvName() {
+        return fromSubInvName;
+    }
+
+    public void setFromSubInvName(String fromSubInvName) {
+        this.fromSubInvName = fromSubInvName;
+    }
 
     public String getStartDate() {
         return startDate;

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

@@ -52,8 +52,7 @@ 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 -> {

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

@@ -31,6 +31,9 @@
             <if test="originAction != ''and originAction != null">
                 AND basic_bustype_change.originAction = #{originAction}
             </if>
+            <if test="originName != ''and originName != null">
+                AND basic_bustype_change.originName = #{originName}
+            </if>
             <if test="enable != null">
                 AND basic_bustype_change.`enable` = #{enable}
             </if>

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

@@ -77,6 +77,11 @@
             <if test="spUse != ''and spUse != null">
                 AND basic_bustype_local.spUse =#{spUse}
             </if>
+            <if test="(auditStatus == null or auditStatus == '') and auditStatusList != null and auditStatusList.size() >0">
+                <foreach collection="auditStatusList" item="auditStatus" open="AND (" separator="OR" close=")">
+                    auditStatus = #{auditStatus,jdbcType=VARCHAR}
+                </foreach>
+            </if>
         </where>
         group by basic_bussiness_type.action
 
@@ -122,6 +127,9 @@
             <if test="userId != ''and userId != null">
                 AND inv_bustype_user.`userId` = #{userId}
             </if>
+            <if test="type != null">
+                AND  inv_bustype_user.subInvCode = #{code}
+            </if>
         </where>
         group by basic_bussiness_type.action
     </select>

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

@@ -115,6 +115,11 @@
             <if test="secCheckEnable != ''and secCheckEnable != null">
                 AND basic_bussiness_type.secCheckEnable =#{secCheckEnable}
             </if>
+            <if test="actionList != null and actionList.size() >0">
+                <foreach collection="actionList" item="action" open="AND (" separator="AND" close=")">
+                    basic_bussiness_type.action &lt;&gt; #{action,jdbcType=VARCHAR}
+                </foreach>
+            </if>
 
         </where>
 

api-admin/src/main/resources/mybatis/mapper/purchase/SupManufacturerDao.xml

@@ -114,7 +114,7 @@
                 #{productionArea}, #{productionAreaCode}, #{productionAddress},
                 #{registerStatus}, #{productionLicenceNum}, #{productionLicenceDate},
                 #{productionRecordNum}, #{productionRecordSection}, #{productionRecordDate},
-                #{remark}, #{createTime}, #{updateDate}, #{customerId}, #{manufacturerId}, #{auditStatus},
+                #{remark}, #{createTime}, #{updateTime}, #{customerId}, #{manufacturerId}, #{auditStatus},
                 #{auditComment})
     </insert>
 

api-admin/src/main/resources/mybatis/mapper/thrsys/ThrOrderDao.xml

@@ -60,8 +60,10 @@
 
     <select id="filterReceiveOrder" parameterType="com.glxp.sale.admin.req.thrsys.FilterThrOrderRequest"
             resultType="com.glxp.sale.admin.entity.thrsys.ThrOrderEntity">
-        SELECT thr_order.*,basic_bustype_change.originName billTypeName FROM thr_order
+        SELECT thr_order.*,basic_bustype_change.originName billTypeName,s1.name as invWarehouseName,s2.name as fromSubInvName FROM thr_order
         left join basic_bustype_change on thr_order.billType = basic_bustype_change.originAction
+        LEFT JOIN inv_warehouse_sub s1 ON thr_order.invWarehouseCode=s1.`code`
+        LEFT JOIN inv_warehouse_sub s2 ON thr_order.fromSubInvCode=s2.`code`
         <where>
             <if test="billNo != '' and billNo != null">
                 AND billNo = #{billNo}