Merge branch 'master' of https://code.palacesun.com/zhouhaifeng/mini-wms

ruoyi-admin-vue/src/views/inventory/materials/index.vue

@@ -146,7 +146,7 @@
               <el-table-column label="物料名称" align="center" prop="materialName"  width="150"/>
               <el-table-column label="物料英文名称" align="center" prop="materialEname"  width="150"/>
               <el-table-column label="TS Code" align="center" prop="tsCode"  width="150"/>
-              <el-table-column label="物料分类" align="center" prop="categoryCode" >
+              <el-table-column label="物料分类" align="center" prop="categoryCode" width="150" >
                 <template slot-scope="scope">
                   {{ scope.row.displayCategory || categoryMap[scope.row.categoryCode] || scope.row.categoryCode }}
                 </template>

ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/MaterialsCategory.java

@@ -24,11 +24,11 @@ public class MaterialsCategory extends BaseEntity
     private String id;
 
     /** 物料编码 检索条件 */
-    @Excel(name = "物料编码 检索条件")
+    @Excel(name = "物料编码")
     private String categoryCode;
 
     /** 物料名称 检索条件 */
-    @Excel(name = "物料名称 检索条件")
+    @Excel(name = "物料名称")
     private String categoryName;
 
     /** 排序 */

ruoyi-inventory/src/main/java/com/ruoyi/inventory/service/impl/InboundOrdersServiceImpl.java

@@ -96,6 +96,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
         inboundOrders.setCreateUserCode(SystemUtils.getUserName());
         inboundOrders.setCreateBy(SystemUtils.getUserName());
         inboundOrders.setIsImport(0);
+        inboundOrders.setIsUsed(1L);
         int rows = inboundOrdersMapper.insertInboundOrders(inboundOrders);
         insertInboundOrderItems(inboundOrders);
         return rows;
@@ -168,7 +169,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                 inboundOrderItems.setId(UUID.randomUUID().toString());
                 inboundOrderItems.setOrderId(orderId);
                 inboundOrderItems.setInboundOrderId(inboundOrders.getId());
-
+                inboundOrderItems.setIsUsed(1L);
                 list.add(inboundOrderItems);
             }
             if (list.size() > 0)
@@ -340,6 +341,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                     mainDO.setCreateTime(now);
                     mainDO.setCreateUserCode(operId);
                     mainDO.setIsImport(1);
+                    mainDO.setIsUsed(1L);
                     mainDO.setOrderTypeId(Optional.ofNullable(orderType).map(String::valueOf).orElse(""));
                     // 设置默认值
                     if (mainDO.getSortNo() == null) {
@@ -388,7 +390,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                         itemDO.setCreateTime(now);
                         itemDO.setCreateUserCode(operId);
                         itemDO.setOrderId(orderId); // 关联入库单号
-
+                        itemDO.setIsUsed(1L);
                         // 反射获取batchId并设置
                         try {
                             Method getBatchIdMethod = vo.getClass().getMethod("getBatchId");