自有库临时库改名

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehouseBaseInfoController.java

@@ -35,7 +35,7 @@ public class WarehouseBaseInfoController {
     }
 
     /**
-     * 添加临时库
+     * 添加临时仓库
      * @param warehouseBaseInfo
      * @return
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/controller/WarehouseInOutInfoController.java

@@ -40,7 +40,7 @@ public class WarehouseInOutInfoController {
         return warehouseInOutInfoService.selectWarehouseInOutInfo(warehouseInOutInfo);
     }
     /**
-     * 待完成页面分页列表查询(临时库)
+     * 待完成页面分页列表查询(临时仓库)
      * @param warehouseInOutInfo
      * @return
      */
@@ -79,7 +79,7 @@ public class WarehouseInOutInfoController {
     }
 
     /**
-     * 流转记录查询(临时库)
+     * 流转记录查询(临时仓库)
      * @param warehouseInOutInfo
      * @return
      */
@@ -89,7 +89,7 @@ public class WarehouseInOutInfoController {
     }
 
     /**
-     * 临时库货名下拉列表
+     * 临时仓库货名下拉列表
      * @param baseId
      * @return
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/TranTaskInfo.java

@@ -66,7 +66,7 @@ public class TranTaskInfo extends BaseModel<TranTaskInfo> {
      */
     private Float weight;
     /**
-     * 发货库类型(1自有库2临时库)
+     * 发货库类型(1常用仓库2临时仓库)
      */
     private String warehouseType;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseBaseInfo.java

@@ -45,11 +45,11 @@ public class WarehouseBaseInfo extends BaseModel<WarehouseBaseInfo> {
      */
     private String warehouseName;
     /**
-     * 仓库类型(1 自有库 2 临时库)
+     * 仓库类型(1 常用仓库 2 临时仓库)
      */
     private String warehouseType;
     /**
-     * 创建临时库方式(1 自动 2 手动)
+     * 创建临时仓库方式(1 自动 2 手动)
      */
     private String createType;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/WarehouseInOutInfo.java

@@ -107,11 +107,11 @@ public class WarehouseInOutInfo extends BaseModel<WarehouseInOutInfo> {
      */
     private String inOutType;
     /**
-     * 临时库出库类型key
+     * 临时仓库出库类型key
      */
     private String temporaryOutTypeKey;
     /**
-     * 临时库出库类型
+     * 临时仓库出库类型
      */
     private String temporaryOutType;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/entity/view/WarehouseView.java

@@ -52,11 +52,11 @@ public class WarehouseView {
      */
     private String remark;
     /**
-     * 临时库地址
+     * 临时仓库地址
      */
     private String address;
     /**
-     * 创建临时库方式(1 自动 2 手动)
+     * 创建临时仓库方式(1 自动 2 手动)
      */
     private String createType;
     /**

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/mapper/WarehouseInOutInfoMapper.java

@@ -32,7 +32,7 @@ public interface WarehouseInOutInfoMapper extends BaseMapper<WarehouseInOutInfo>
      */
     List<WarehouseInOutInfo> getListByCondition(Map<String, Object> pageView);
     /**
-     * 根据条件流转记录总数(临时库)
+     * 根据条件流转记录总数(临时仓库)
      *
      * @param pageView
      * @return
@@ -40,7 +40,7 @@ public interface WarehouseInOutInfoMapper extends BaseMapper<WarehouseInOutInfo>
     Integer getCountByConditionTemporary(Map<String, Object> pageView);
 
     /**
-     * 根据条件查询流转记录列表(临时库)
+     * 根据条件查询流转记录列表(临时仓库)
      *
      * @param pageView
      * @return

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWarehouseBaseInfoService.java

@@ -24,7 +24,7 @@ public interface IWarehouseBaseInfoService extends IService<WarehouseBaseInfo> {
     String addWarehouse(WarehouseBaseInfo warehouseBaseInfo);
 
     /**
-     * 添加临时库
+     * 添加临时仓库
      * @param warehouseBaseInfo
      * @return
      */

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/IWarehouseInOutInfoService.java

@@ -24,7 +24,7 @@ public interface IWarehouseInOutInfoService extends IService<WarehouseInOutInfo>
      */
     Page<WarehouseInOutInfo> selectWarehouseInOutInfo(WarehouseInOutInfo warehouseInOutInfo);
     /**
-     * 待完成页面列表(临时库)
+     * 待完成页面列表(临时仓库)
      *
      * @param warehouseInOutInfo
      * @return
@@ -49,7 +49,7 @@ public interface IWarehouseInOutInfoService extends IService<WarehouseInOutInfo>
     Page<WarehouseInOutInfo> selectInfo(WarehouseInOutInfo warehouseInOutInfo);
 
     /**
-     * 流转记录分页查询(临时库)
+     * 流转记录分页查询(临时仓库)
      *
      * @param warehouseInOutInfo
      * @return
@@ -57,7 +57,7 @@ public interface IWarehouseInOutInfoService extends IService<WarehouseInOutInfo>
     Page<WarehouseInOutInfo> selectInfoTemporary(WarehouseInOutInfo warehouseInOutInfo);
 
     /**
-     * 临时库货名下拉
+     * 临时仓库货名下拉
      *
      * @param baseId
      * @return

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/ContractManagementInfoServiceImpl.java

@@ -103,7 +103,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             // 插入操作历史
             this.billOperateHisService.saveBillOperateHis(contractManagementInfo.getId(), NumberConstant.CONSTANT_CONTRACT, staffName, null,
                     StatusEnum.CONTRACT_WAIT.getName(), StatusEnum.CONTRACT_WAIT.getName(), "");
-            //自运采购合同添加临时库
+            //自运采购合同添加临时仓库
             if (NumberConstant.CONSTANT2.equals(contractManagementInfo.getContractType()) && NumberConstant.CONSTANT1.equals(contractManagementInfo.getDeliverType())) {
                 WarehouseBaseInfo warehouseBaseInfo = new WarehouseBaseInfo();
                 warehouseBaseInfo.setId(IdGenerator.generateUUID());
@@ -117,7 +117,7 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
                 warehouseBaseInfo.setWarehouseCity(contractManagementInfo.getSourceCity());
                 warehouseBaseInfo.setWarehouseArea(contractManagementInfo.getSourceArea());
                 warehouseBaseInfo.setDetailedAddress(contractManagementInfo.getSourceGoods());
-                //临时库流转页面
+                //临时仓库流转页面
                 WarehouseInOutInfo warehouseInOutInfo = new WarehouseInOutInfo();
                 warehouseInOutInfo.setId(IdGenerator.generateUUID());
                 warehouseInOutInfo.setBaseId(warehouseBaseInfo.getId());
@@ -271,10 +271,10 @@ public class ContractManagementInfoServiceImpl extends ServiceImpl<ContractManag
             contractGoodsInfoService.deleteById(contractGoodsInfo.getId());
             contractProcessInfoService.deleteById(contractProcessInfo.getId());
             if("2".equals(contractManagementInfo.getContractType()) && "1".equals(contractManagementInfo.getDeliverType())){
-                //临时库信息
+                //临时仓库信息
                 WarehouseBaseInfo warehouseBaseInfo =  warehouseBaseInfoService.selectOne(new EntityWrapper<WarehouseBaseInfo>().eq(WarehouseBaseInfo.QueryFiles.WAREHOUSE_NAME, contractManagementInfo.getContractNo()));
                 warehouseBaseInfoService.deleteById(warehouseBaseInfo.getId());
-                //临时库出入库信息
+                //临时仓库出入库信息
                 List<WarehouseInOutInfo> warehouseInOutInfos = warehouseInOutInfoService.selectList(new EntityWrapper<WarehouseInOutInfo>().eq(WarehouseInOutInfo.QueryFiles.BASE_ID,warehouseBaseInfo.getId()));
                 if(!CollectionUtils.isEmpty(warehouseInOutInfos)){
                     for(WarehouseInOutInfo warehouseInOutInfo : warehouseInOutInfos ){

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/TranProcessInfoServiceImpl.java

@@ -122,13 +122,14 @@ public class TranProcessInfoServiceImpl extends ServiceImpl<TranProcessInfoMappe
         List<TranCarInfo> tranCarInfoListTmp = new ArrayList<>();
         if (!CollectionUtils.isEmpty(tranCarInfoList)) {
             for (TranCarInfo tranCarInfos : tranCarInfoList) {
+                //判断是否有记录
                 if(!StringUtils.isEmpty(tranCarInfos.getId())){
                     continue;
                 }
                 tranCarInfos.setProcessId(tranProcessInfo.getId());
                 tranCarInfos.setInfoId(tranProcessInfo.getInfoId());
                 tranCarInfos.setId(IdGenerator.generateUUID());
-                //汽运
+                //汽运类型
                 if(tranCarInfos.getTranType().equals(NumberConstant.CONSTANT1)){
                     tranCarInfos.setStatusFlag(StatusEnum.NOT_DELIVERED.getFlag());
                     tranCarInfos.setStatus(StatusEnum.NOT_DELIVERED.getName());

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseBaseInfoServiceImpl.java

@@ -299,7 +299,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
     }
 
     /**
-     * 添加临时库
+     * 添加临时仓库
      *
      * @param warehouseBaseInfo
      * @return
@@ -442,7 +442,7 @@ public class WarehouseBaseInfoServiceImpl extends ServiceImpl<WarehouseBaseInfoM
                         }
                     }
                 }
-                //临时库
+                //临时仓库
                 else {
                     //定义入库
                     String inNetWeight = "";

winsea-haixin-plugin-yiliangyiyun/src/main/java/com/yh/saas/plugin/yiliangyiyun/service/impl/WarehouseInOutInfoServiceImpl.java

@@ -86,7 +86,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     }
 
     /**
-     * 待完成页面列表(临时库)
+     * 待完成页面列表(临时仓库)
      *
      * @param warehouseInOutInfo
      * @return
@@ -285,7 +285,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     }
 
     /**
-     * 流转记录查询(临时库)
+     * 流转记录查询(临时仓库)
      *
      * @param warehouseInOutInfo
      * @return
@@ -312,7 +312,7 @@ public class WarehouseInOutInfoServiceImpl extends ServiceImpl<WarehouseInOutInf
     }
 
     /**
-     * 临时库货名下拉列表
+     * 临时仓库货名下拉列表
      *
      * @param baseId
      * @return

winsea-haixin-plugin-yiliangyiyun/src/main/resources/mapper/WarehouseInOutInfoMapper.xml

@@ -66,7 +66,7 @@
             LIMIT ${startRecord}, ${pageSize}
         </if>
     </select>
-    <!-- 获得流转记录总数(临时库) -->
+    <!-- 获得流转记录总数(临时仓库) -->
     <select id="getCountByConditionTemporary" parameterType="Map" resultType="java.lang.Integer">
         SELECT
         COUNT(w.id)
@@ -85,7 +85,7 @@
             </if>
         </if>
     </select>
-    <!-- 流转记录列表查询(临时库) -->
+    <!-- 流转记录列表查询(临时仓库) -->
     <select id="getListByConditionTemporary" parameterType="Map"
             resultType="com.yh.saas.plugin.yiliangyiyun.entity.WarehouseInOutInfo">
         SELECT