Merge remote-tracking branch 'origin/master'

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

@@ -108,8 +108,8 @@
             @keyup.enter.native="handleQuery"
           />
         </el-form-item>
-        <el-form-item label="入库类型" prop="orderTypeId">
-          <el-select v-model="queryParams.orderTypeId" placeholder="请选择入库类型" clearable>
+        <el-form-item label="订单类型" prop="orderTypeId">
+          <el-select v-model="queryParams.orderTypeId" placeholder="请选择订单类型" clearable>
             <el-option
               v-for="dict in dict.type.inbound_type"
               :key="dict.value"
@@ -146,7 +146,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="订单类型" prop="orderType">
+        <!-- <el-form-item label="订单类型" prop="orderType">
           <el-select v-model="queryParams.orderType" placeholder="请选择订单类型" clearable>
             <el-option
               v-for="dict in dict.type.order_type"
@@ -155,7 +155,7 @@
               :value="dict.value"
             />
           </el-select>
-        </el-form-item>
+        </el-form-item> -->
       </page-wrapper-search>
 
       <!-- 表格区域 -->
@@ -171,7 +171,7 @@
           <el-table-column label="批次号" align="center" prop="batchId" min-width="200"/>
           <el-table-column label="系统编号" align="center" prop="systemNo" min-width="200"/>
           <el-table-column label="货主" align="center" prop="ownerName" min-width="200"/>
-          <el-table-column label="入库类型" align="center" prop="orderTypeId" show-overflow-tooltip min-width="200">
+          <el-table-column label="订单类型" align="center" prop="orderTypeId" show-overflow-tooltip min-width="200">
             <template slot-scope="scope">
               <el-tag
                 :type="getDictTagClass('inbound_type', scope.row.orderTypeId)"
@@ -181,7 +181,7 @@
               </el-tag>
             </template>
           </el-table-column>
-          <el-table-column label="订单类型" align="center" prop="orderType" show-overflow-tooltip min-width="200">
+          <!-- <el-table-column label="订单类型" align="center" prop="orderType" show-overflow-tooltip min-width="200">
             <template slot-scope="scope">
               <el-tag
                 :type="getDictTagClass('order_type', scope.row.orderType)"
@@ -190,7 +190,7 @@
                 {{ getDictLabel('order_type', scope.row.orderType) }}
               </el-tag>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="入库单状态" align="center" prop="orderStatus" min-width="200">
             <template slot-scope="scope">
               <el-tag 
@@ -279,8 +279,8 @@
             <el-form-item label="批次号" prop="batchId">
               <el-input v-model="form.batchId" placeholder="请输入批次号" />
             </el-form-item>
-            <el-form-item label="入库类型" prop="orderTypeId">
-              <el-select v-model="form.orderTypeId" placeholder="请选择入库类型" clearable>
+            <el-form-item label="订单类型" prop="orderTypeId">
+              <el-select v-model="form.orderTypeId" placeholder="请选择订单类型" clearable>
                 <el-option
                   v-for="dict in dict.type.inbound_type"
                   :key="dict.value"
@@ -289,15 +289,6 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item label="入库日期" prop="inboundDate">
-              <el-date-picker
-                clearable
-                v-model="form.inboundDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择入库日期"
-              />
-            </el-form-item>
           </el-col>
           <el-col :span="12">
             <el-form-item label="系统编号" prop="systemNo">
@@ -321,7 +312,16 @@
                 </template>
               </el-input>
             </el-form-item>
-            <el-form-item label="订单类型" prop="orderType">
+              <el-form-item label="入库日期" prop="inboundDate">
+              <el-date-picker
+                clearable
+                v-model="form.inboundDate"
+                type="date"
+                value-format="yyyy-MM-dd"
+                placeholder="请选择入库日期"
+              />
+            </el-form-item>
+            <!-- <el-form-item label="订单类型" prop="orderType">
               <el-select v-model="form.orderType" placeholder="请选择订单类型" clearable>
                 <el-option
                   v-for="dict in dict.type.order_type"
@@ -330,7 +330,7 @@
                   :value="dict.value"
                 />
               </el-select>
-            </el-form-item>
+            </el-form-item> -->
           </el-col>
         </el-row>
 
@@ -386,12 +386,12 @@
           <el-descriptions-item label="系统编号">{{ detailForm.systemNo || '-' }}</el-descriptions-item>
           <el-descriptions-item label="批次号">{{ detailForm.batchId || '-' }}</el-descriptions-item>
           <el-descriptions-item label="货主">{{ detailForm.ownerName || detailForm.ownerId || '-' }}</el-descriptions-item>
-          <el-descriptions-item label="入库类型">
+          <el-descriptions-item label="订单类型">
             {{ getDictLabel('inbound_type', detailForm.orderTypeId) }}
           </el-descriptions-item>
-          <el-descriptions-item label="订单类型">
+          <!-- <el-descriptions-item label="订单类型">
             {{ getDictLabel('order_type', detailForm.orderType) }}
-          </el-descriptions-item>
+          </el-descriptions-item> -->
           <el-descriptions-item label="入库日期">{{ detailForm.inboundDate || '-' }}</el-descriptions-item>
           <el-descriptions-item label="备注" :span="2">
             <div class="remark-text">{{ detailForm.remark || '-' }}</div>
@@ -582,7 +582,7 @@ export default {
       // 表单校验规则
       rules: {
         orderId: [{ required: true, message: "入库单号不能为空", trigger: "blur" }],
-        orderTypeId: [{ required: true, message: "入库类型不能为空", trigger: "blur" }],
+        orderTypeId: [{ required: true, message: "订单类型不能为空", trigger: "blur" }],
         systemNo: [{ required: true, message: "系统编号不能为空", trigger: "blur" }],
         batchId: [{ required: true, message: "批次号不能为空", trigger: "blur" }],
         ownerId: [{ required: true, message: "货主不能为空", trigger: "change" }]

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

@@ -363,7 +363,8 @@ export default {
         { prop: 'labelColor', label: '标签颜色', width: '100', type: 'select', editable: true },
         { prop: 'voucherNumber', label: '凭证号', width: '150', editable: true },
         { prop: 'unitPrice', label: '单价', width: '100', type: 'number', editable: true },
-        { prop: 'receivedBy', label: '收货人', width: '150', editable: true },
+        // { prop: '', label: '危险类别', width: '150', editable: true },
+        // { prop: 'receivedBy', label: '收货人', width: '150', editable: true },
         { prop: 'labelQuantity', label: '贴标数量', width: '150',type: 'number', editable: true },
         { prop: 'remark', label: '备注', minWidth: '150', editable: true },
       ]

ruoyi-inventory/src/main/java/com/ruoyi/inventory/domain/vo/inboundVO/InboundTemplateVO.java

@@ -103,7 +103,7 @@ public class InboundTemplateVO extends BaseEntity {
 
     /** 入库类型 字典，检索条件 */
     @Excel(name = "贴标数量")
-    private String labelQuantity;
+    private Long labelQuantity;
 
     /** 订单类型 字典，检索条件 */
     @Excel(name = "订单类型")
@@ -113,8 +113,8 @@ public class InboundTemplateVO extends BaseEntity {
     private Double packageWeight;
 
     /** 单价 */
-//    @Excel(name = "单价")
-    private Long unitPrice;
+    @Excel(name = "单价")
+    private Double unitPrice;
 
     /** 收货人 */
 //    @Excel(name = "收货人")

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

@@ -187,7 +187,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public <T> String importInboundOrders(List<T> inboundOrdersList, Integer isUpdateSupport, String operName, Integer orderType) {
+    public <T> String importInboundOrders(List<T> inboundOrdersList, Integer isUpdateSupport, String operName, Integer orderTypeId) {
         if (StringUtils.isNull(inboundOrdersList) || inboundOrdersList.size() == 0) {
             throw new ServiceException("导入数据不能为空！");
         }
@@ -230,6 +230,13 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                                 .map(Object::toString)
                                 .map(String::trim)
                                 .orElse("");
+                        // 反射获取getOrderType方法
+
+                        Method getOrderType = vo.getClass().getMethod("getOrderType");
+                        String orderType = Optional.ofNullable(getOrderType.invoke(vo))
+                                .map(Object::toString)
+                                .map(String::trim)
+                                .orElse("");
 
                         // 反射调用setOrderId方法回写处理后的单号
                         Method setOrderIdMethod = vo.getClass().getMethod("setOrderId", String.class);
@@ -237,6 +244,9 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                         // 反射调用setBatchId方法回写处理后的批次号
                         Method setBatchIdMethod = vo.getClass().getMethod("setBatchId",String.class);
                         setBatchIdMethod.invoke(vo,batchId);
+                        // 反射调用setOrderTypeMethod方法回写处理后的orderType
+                        Method setOrderTypeMethod = vo.getClass().getMethod("setOrderType",String.class);
+                        setOrderTypeMethod.invoke(vo, orderType);
                     } catch (Exception e) {
                         throw new ServiceException("实体类缺少orderId的getter/setter方法" + e);
                     }
@@ -261,6 +271,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                             try {
                                 Method getOrderIdMethod = vo.getClass().getMethod("getOrderId");
                                 Method getBatchIdMethod = vo.getClass().getMethod("getBatchId");
+                                Method getOrderType = vo.getClass().getMethod("getOrderType");
                                 return Optional.ofNullable(getOrderIdMethod.invoke(vo))
                                         .map(Object::toString)
                                         .map(String::trim)
@@ -269,7 +280,12 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                                         Optional.ofNullable(getBatchIdMethod.invoke(vo))
                                         .map(Object::toString)
                                         .map(String::trim)
-                                        .orElse("");
+                                        .orElse("")
+                                        + "--" +
+                                        Optional.ofNullable(getOrderType.invoke(vo))
+                                                .map(Object::toString)
+                                                .map(String::trim)
+                                                .orElse("");
                             } catch (Exception e) {
                                 throw new ServiceException("分组获取orderId失败" + e);
                             }
@@ -287,11 +303,13 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
             String orderKey = entry.getKey();
             String orderId = "";
             String batchId = "";
+            String orderType = "";
             try{
                 orderId = orderKey.split("--")[0];
                 batchId = orderKey.split("--")[1];
+                orderType = orderKey.split("--")[2];
             }catch (IndexOutOfBoundsException e){
-                throw new ServiceException("请检查表头单号和批次号是否正确？");
+                throw new ServiceException("请检查表头单号和批次号和订单类型是否正确？");
             }
             List<T> voList = entry.getValue();
             InboundOrders mainDO = null;
@@ -305,6 +323,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                 InboundOrders query = new InboundOrders();
                 query.setOrderId(orderId);
                 query.setBatchId(batchId);
+                query.setOrderType(orderType);
                 List<InboundOrders> existMain = inboundOrdersMapper.selectInboundOrdersList(query);
 
                 if (existMain != null && !existMain.isEmpty()) {
@@ -322,7 +341,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                     mainDO.setUpdateBy(operId);
                     mainDO.setUpdateTime(now);
                     mainDO.setUpdateUserCode(operId);
-                    mainDO.setOrderTypeId(Optional.ofNullable(orderType).map(String::valueOf).orElse(""));
+                    mainDO.setOrderTypeId(Optional.ofNullable(orderTypeId).map(String::valueOf).orElse(""));
                     // 更新主表
                     inboundOrdersMapper.updateInboundOrders(mainDO);
                     totalMainSuccess++;
@@ -341,6 +360,7 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
                     mainDO.setOrderId(orderId);
                     mainDO.setCreateBy(operId);
                     mainDO.setCreateTime(now);
+                    mainDO.setRemark("");
                     mainDO.setCreateUserCode(operId);
                     mainDO.setIsImport(1);
                     mainDO.setIsUsed(1L);
@@ -407,17 +427,8 @@ public class InboundOrdersServiceImpl implements IInboundOrdersService
 
                         itemDO.setInboundOrderId(mainDO.getId()); // 关联主表ID（核心！）
                         itemDO.setSortNo(0L);
-                        // 反射获取remark2并设置
-                        String remark2 = "";
-                        try {
-                            Method getRemark2Method = vo.getClass().getMethod("getRemark2");
-                            remark2 = Optional.ofNullable(getRemark2Method.invoke(vo))
-                                    .map(Object::toString)
-                                    .orElse("");
-                        } catch (Exception e) {
-                            throw new ServiceException("获取明细备注失败" + e);
-                        }
-                        itemDO.setRemark(remark2);
+
+
 
                         // ========== 物料SAPNO校验（反射获取sapNo） ==========
                         String sapNo = "";