-- 条码扫描记录,条码库存记录,产品库存记录,出入库,库位库存界面调整

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/erp/ErpBarcodesInvController.java

@@ -3,6 +3,7 @@ package com.ruoyi.web.controller.warewms.wms.erp;
 import com.ruoyi.ams.erp.domain.ErpBarcodes;
 import com.ruoyi.ams.erp.service.IErpBarcodesInvService;
 import com.ruoyi.ams.erp.service.IErpBarcodesService;
+import com.ruoyi.ams.order.erp.ErpBarCodesVO;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -27,7 +28,7 @@ import java.util.List;
 public class ErpBarcodesInvController extends BaseController
 {
     @Autowired
-    private IErpBarcodesInvService erpBarcodesService;
+    private IErpBarcodesInvService erpBarcodesInvService;
 
     /**
      * 查询条码库存记录表列表
@@ -37,7 +38,7 @@ public class ErpBarcodesInvController extends BaseController
     public TableDataInfo list(ErpBarcodes erpBarcodes)
     {
         startPage();
-        List<ErpBarcodes> list = erpBarcodesService.selectErpBarcodesList(erpBarcodes);
+        List<ErpBarCodesVO> list = erpBarcodesInvService.selectErpBarcodesList(erpBarcodes);
         return getDataTable(list);
     }
 
@@ -45,12 +46,12 @@ public class ErpBarcodesInvController extends BaseController
      * 导出条码库存记录表列表
      */
     @PreAuthorize("@ss.hasPermi('system:barcodesinv:export')")
-    @Log(title = "条码扫描记录表", businessType = BusinessType.EXPORT)
+    @Log(title = "条码库存记录表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ErpBarcodes erpBarcodes)
     {
-        List<ErpBarcodes> list = erpBarcodesService.selectErpBarcodesList(erpBarcodes);
-        ExcelUtil<ErpBarcodes> util = new ExcelUtil<ErpBarcodes>(ErpBarcodes.class);
+        List<ErpBarCodesVO> list = erpBarcodesInvService.selectErpBarcodesList(erpBarcodes);
+        ExcelUtil<ErpBarCodesVO> util = new ExcelUtil<ErpBarCodesVO>(ErpBarCodesVO.class);
         util.exportExcel(response, list, "条码扫描记录表数据");
     }
 
@@ -61,39 +62,39 @@ public class ErpBarcodesInvController extends BaseController
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
-        return AjaxResult.success(erpBarcodesService.selectErpBarcodesById(id));
+        return AjaxResult.success(erpBarcodesInvService.selectErpBarcodesById(id));
     }
 
     /**
      * 新增条码库存记录表
      */
     @PreAuthorize("@ss.hasPermi('system:barcodesinv:add')")
-    @Log(title = "条码扫描记录表", businessType = BusinessType.INSERT)
+    @Log(title = "条码库存记录表", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ErpBarcodes erpBarcodes)
     {
-        return toAjax(erpBarcodesService.insertErpBarcodes(erpBarcodes));
+        return toAjax(erpBarcodesInvService.insertErpBarcodes(erpBarcodes));
     }
 
     /**
      * 修改条码库存记录表
      */
     @PreAuthorize("@ss.hasPermi('system:barcodesinv:edit')")
-    @Log(title = "条码扫描记录表", businessType = BusinessType.UPDATE)
+    @Log(title = "条码库存记录表", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ErpBarcodes erpBarcodes)
     {
-        return toAjax(erpBarcodesService.updateErpBarcodes(erpBarcodes));
+        return toAjax(erpBarcodesInvService.updateErpBarcodes(erpBarcodes));
     }
 
     /**
      * 删除条码库存记录表
      */
     @PreAuthorize("@ss.hasPermi('system:barcodesinv:remove')")
-    @Log(title = "条码扫描记录表", businessType = BusinessType.DELETE)
+    @Log(title = "条码库存记录表", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
-        return toAjax(erpBarcodesService.deleteErpBarcodesByIds(ids));
+        return toAjax(erpBarcodesInvService.deleteErpBarcodesByIds(ids));
     }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/wms/erp/ErpSkuInvController.java

@@ -2,6 +2,7 @@ package com.ruoyi.web.controller.warewms.wms.erp;
 
 import com.ruoyi.ams.erp.domain.ErpBarcodes;
 import com.ruoyi.ams.erp.service.IErpSkuInvService;
+import com.ruoyi.ams.order.erp.ErpBarCodesVO;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
@@ -36,7 +37,7 @@ public class ErpSkuInvController extends BaseController
     public TableDataInfo list(ErpBarcodes erpBarcodes)
     {
         startPage();
-        List<ErpBarcodes> list = erpSkuInvService.selectErpBarcodesList(erpBarcodes);
+        List<ErpBarCodesVO> list = erpSkuInvService.selectErpBarcodesList(erpBarcodes);
         return getDataTable(list);
     }
 
@@ -44,12 +45,12 @@ public class ErpSkuInvController extends BaseController
      * 导出产品库存记录列表
      */
     @PreAuthorize("@ss.hasPermi('system:skuinv:export')")
-    @Log(title = "条码扫描记录表", businessType = BusinessType.EXPORT)
+    @Log(title = "产品库存记录表", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     public void export(HttpServletResponse response, ErpBarcodes erpBarcodes)
     {
-        List<ErpBarcodes> list = erpSkuInvService.selectErpBarcodesList(erpBarcodes);
-        ExcelUtil<ErpBarcodes> util = new ExcelUtil<ErpBarcodes>(ErpBarcodes.class);
+        List<ErpBarCodesVO> list = erpSkuInvService.selectErpBarcodesList(erpBarcodes);
+        ExcelUtil<ErpBarCodesVO> util = new ExcelUtil<ErpBarCodesVO>(ErpBarCodesVO.class);
         util.exportExcel(response, list, "条码扫描记录表数据");
     }
 
@@ -67,7 +68,7 @@ public class ErpSkuInvController extends BaseController
      * 新增产品库存记录
      */
     @PreAuthorize("@ss.hasPermi('system:skuinv:add')")
-    @Log(title = "条码扫描记录表", businessType = BusinessType.INSERT)
+    @Log(title = "产品库存记录表", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody ErpBarcodes erpBarcodes)
     {
@@ -78,7 +79,7 @@ public class ErpSkuInvController extends BaseController
      * 修改产品库存记录
      */
     @PreAuthorize("@ss.hasPermi('system:skuinv:edit')")
-    @Log(title = "条码扫描记录表", businessType = BusinessType.UPDATE)
+    @Log(title = "产品库存记录表", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody ErpBarcodes erpBarcodes)
     {
@@ -89,7 +90,7 @@ public class ErpSkuInvController extends BaseController
      * 删除产品库存记录
      */
     @PreAuthorize("@ss.hasPermi('system:skuinv:remove')")
-    @Log(title = "条码扫描记录表", businessType = BusinessType.DELETE)
+    @Log(title = "产品库存记录表", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {

ruoyi-ui/src/views/ams/inv/invLotLocId/index.vue

@@ -141,12 +141,8 @@
       <el-table-column label="是否满拖" align="center" prop="isFull"/>
       <el-table-column label="库存数量" align="center" prop="qty"/>
       <el-table-column label="已分配数量" align="center" prop="qtyallocated" width="200"/>
-      <el-table-column
-        v-for="(item, index) in tableOption"
-        :key="index"
-        :label="item.label"
-        align="center" :prop="item.prop" width="200">
-      </el-table-column>
+      <el-table-column label="托盘号" align="center" prop="lotatt07" width="200"/>
+      <el-table-column label="入库单号" align="center" prop="lotatt08" width="200"/>
       <el-table-column label="备注" align="center" prop="remark" />
       <!--<el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">

ruoyi-ui/src/views/wms/barcodes/index.vue

@@ -79,49 +79,49 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:barcodes:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:barcodes:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:barcodes:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:barcodes:export']"
-        >导出</el-button>
-      </el-col>
+<!--     <el-row :gutter="10" class="mb8">-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="primary"-->
+<!--           plain-->
+<!--           icon="el-icon-plus"-->
+<!--           size="mini"-->
+<!--           @click="handleAdd"-->
+<!--           v-hasPermi="['system:barcodes:add']"-->
+<!--         >新增</el-button>-->
+<!--       </el-col>-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="success"-->
+<!--           plain-->
+<!--           icon="el-icon-edit"-->
+<!--           size="mini"-->
+<!--           :disabled="single"-->
+<!--           @click="handleUpdate"-->
+<!--           v-hasPermi="['system:barcodes:edit']"-->
+<!--         >修改</el-button>-->
+<!--       </el-col>-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="danger"-->
+<!--           plain-->
+<!--           icon="el-icon-delete"-->
+<!--           size="mini"-->
+<!--           :disabled="multiple"-->
+<!--           @click="handleDelete"-->
+<!--           v-hasPermi="['system:barcodes:remove']"-->
+<!--         >删除</el-button>-->
+<!--       </el-col>-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="warning"-->
+<!--           plain-->
+<!--           icon="el-icon-download"-->
+<!--           size="mini"-->
+<!--           @click="handleExport"-->
+<!--           v-hasPermi="['system:skuinv:export']"-->
+<!--         >导出</el-button>-->
+<!--       </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
@@ -138,24 +138,24 @@
       <el-table-column label="erp单号" align="center" prop="erpNo" />
       <el-table-column label="项次" align="center" prop="erpName" />
       <el-table-column label="erp单据类型" align="center" prop="erpType" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:barcodes:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:barcodes:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:barcodesinv:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['system:barcodesinv:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     
     <pagination

ruoyi-ui/src/views/wms/barcodesinv/index.vue

@@ -61,79 +61,78 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:barcodesinv:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:barcodesinv:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:barcodesinv:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:barcodesinv:export']"
-        >导出</el-button>
-      </el-col>
+<!--     <el-row :gutter="10" class="mb8">-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="primary"-->
+<!--           plain-->
+<!--           icon="el-icon-plus"-->
+<!--           size="mini"-->
+<!--           @click="handleAdd"-->
+<!--           v-hasPermi="['system:barcodes:add']"-->
+<!--         >新增</el-button>-->
+<!--       </el-col>-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="success"-->
+<!--           plain-->
+<!--           icon="el-icon-edit"-->
+<!--           size="mini"-->
+<!--           :disabled="single"-->
+<!--           @click="handleUpdate"-->
+<!--           v-hasPermi="['system:barcodes:edit']"-->
+<!--         >修改</el-button>-->
+<!--       </el-col>-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="danger"-->
+<!--           plain-->
+<!--           icon="el-icon-delete"-->
+<!--           size="mini"-->
+<!--           :disabled="multiple"-->
+<!--           @click="handleDelete"-->
+<!--           v-hasPermi="['system:barcodes:remove']"-->
+<!--         >删除</el-button>-->
+<!--       </el-col>-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="warning"-->
+<!--           plain-->
+<!--           icon="el-icon-download"-->
+<!--           size="mini"-->
+<!--           @click="handleExport"-->
+<!--           v-hasPermi="['system:skuinv:export']"-->
+<!--         >导出</el-button>-->
+<!--       </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="barcodesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
-      <el-table-column label="条码号" align="center" prop="barcode" />
+      <el-table-column label="条码号" align="center" prop="lotatt02" />
       <el-table-column label="仓库id" align="center" prop="stockId" />
       <el-table-column label="货架编号" align="center" prop="locationNo" />
       <el-table-column label="栈板号" align="center" prop="boxNo" />
       <el-table-column label="批次" align="center" prop="lotnum" />
       <el-table-column label="数量" align="center" prop="qty" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:barcodesinv:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:barcodesinv:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:barcodesinv:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['system:barcodesinv:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     
     <pagination
@@ -209,6 +208,8 @@ export default {
         boxNo: null,
         lotnum: null,
         qty: null,
+        lotatt02: null,
+        stockId: null,
         type: null,
         erpNo: null,
         erpName: null,

ruoyi-ui/src/views/wms/docAsn/docAsnDetails.vue

@@ -67,12 +67,12 @@
         align="center"
         label="创建时间" width="160">
       </el-table-column>
-      <el-table-column
-        v-for="(item, index) in tableOption"
-        :key="index"
-        :label="item.label"
-        align="center" :prop="item.prop" width="150">
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        v-for="(item, index) in tableOption"-->
+<!--        :key="index"-->
+<!--        :label="item.label"-->
+<!--       align="center" :prop="item.prop" width="150">-->
+<!--      </el-table-column>-->
     </el-table>
     <pagination
       v-show="total>0"

ruoyi-ui/src/views/wms/docAsn/docAsnHeader-add-or-update.vue

@@ -49,25 +49,25 @@
 <!--              </el-select>-->
 <!--            </el-form-item>-->
 <!--          </el-col>-->
-          <el-col :span="6">
-            <el-form-item label="客户单号" prop="customerNo">
-              <el-input v-model="dataFormHead.customerNo" placeholder=""></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="客户单号" prop="customerNo">-->
+<!--              <el-input v-model="dataFormHead.customerNo" placeholder=""></el-input>-->
+<!--           </el-form-item>-->
+<!--         </el-col>-->
           <el-col :span="6">
             <el-form-item label="ERP单号" prop="asnReference1">
               <el-input v-model="dataFormHead.asnReference1" placeholder=""></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="预计收货时间" prop="expectedArriveTime">
-              <el-date-picker
-                v-model="dataFormHead.expectedArriveTime"
-                type="date"
-                placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="预计收货时间" prop="expectedArriveTime">-->
+<!--              <el-date-picker-->
+<!--                v-model="dataFormHead.expectedArriveTime"-->
+<!--                type="date"-->
+<!--                placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 100%">-->
+<!--              </el-date-picker>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
 <!--          <el-col :span="6">-->
 <!--            <el-form-item label="供应商" prop="supplierId">-->
 <!--              <el-select v-model="dataFormHead.supplierId" placeholder="请选择" style="width: 100%" clearable>-->

ruoyi-ui/src/views/wms/docOrder/docOrderDetails.vue

@@ -51,12 +51,12 @@
         align="center"
         label="拣货数量">
       </el-table-column>
-      <el-table-column
-        v-for="(item, index) in tableOption"
-        :key="index"
-        :label="item.label"
-        align="center" :prop="item.prop" width="150">
-      </el-table-column>
+<!--       <el-table-column-->
+<!--         v-for="(item, index) in tableOption"-->
+<!--         :key="index"-->
+<!--         :label="item.label"-->
+<!--         align="center" :prop="item.prop" width="150">-->
+<!--       </el-table-column>-->
     </el-table>
     <pagination
       v-show="total>0"

ruoyi-ui/src/views/wms/docOrder/docOrderHeader-add-or-update.vue

@@ -46,28 +46,28 @@
 <!--              </el-date-picker>-->
 <!--            </el-form-item>-->
 <!--          </el-col>-->
-          <el-col :span="6">
-            <el-form-item label="客户" prop="customerId">
-              <el-select v-model="dataFormHead.customerId" placeholder="请选择" style="width: 100%" clearable>
-                <el-option
-                  v-for="item in customerIdCombo"
-                  :key="item.value"
-                  :label="item.customerName"
-                  :value="item.customerId">
-                </el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--           <el-col :span="6">-->
+<!--             <el-form-item label="客户" prop="customerId">-->
+<!--               <el-select v-model="dataFormHead.customerId" placeholder="请选择" style="width: 100%" clearable>-->
+<!--                 <el-option-->
+<!--                   v-for="item in customerIdCombo"-->
+<!--                   :key="item.value"-->
+<!--                   :label="item.customerName"-->
+<!--                   :value="item.customerId">-->
+<!--                 </el-option>-->
+<!--               </el-select>-->
+<!--             </el-form-item>-->
+<!--           </el-col>-->
           <el-col :span="6">
             <el-form-item label="ERP单号" prop="soReference1">
               <el-input v-model="dataFormHead.soReference1" placeholder=""></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="客户单号2" prop="soReference2">
-              <el-input v-model="dataFormHead.soReference2" placeholder=""></el-input>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="6">-->
+<!--            <el-form-item label="客户单号2" prop="soReference2">-->
+<!--              <el-input v-model="dataFormHead.soReference2" placeholder=""></el-input>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="6" style="text-align: right;">
             <el-button size="mini" type="primary" :disabled="viewTag || isAdd === false" @click="dataFormHeadSubmit()">提交</el-button>
             <el-button size="mini" type="primary" :disabled="viewTag || isAdd === true" @click="dataFormHeadSubmit()">修改</el-button>

ruoyi-ui/src/views/wms/skuinv/index.vue

@@ -43,79 +43,80 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['system:skuinv:add']"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="success"
-          plain
-          icon="el-icon-edit"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['system:skuinv:edit']"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-          v-hasPermi="['system:skuinv:remove']"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          type="warning"
-          plain
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-          v-hasPermi="['system:skuinv:export']"
-        >导出</el-button>
-      </el-col>
+<!--     <el-row :gutter="10" class="mb8">-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="primary"-->
+<!--           plain-->
+<!--           icon="el-icon-plus"-->
+<!--           size="mini"-->
+<!--           @click="handleAdd"-->
+<!--           v-hasPermi="['system:barcodes:add']"-->
+<!--         >新增</el-button>-->
+<!--       </el-col>-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="success"-->
+<!--           plain-->
+<!--           icon="el-icon-edit"-->
+<!--           size="mini"-->
+<!--           :disabled="single"-->
+<!--           @click="handleUpdate"-->
+<!--           v-hasPermi="['system:barcodes:edit']"-->
+<!--         >修改</el-button>-->
+<!--       </el-col>-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="danger"-->
+<!--           plain-->
+<!--           icon="el-icon-delete"-->
+<!--           size="mini"-->
+<!--           :disabled="multiple"-->
+<!--           @click="handleDelete"-->
+<!--           v-hasPermi="['system:barcodes:remove']"-->
+<!--         >删除</el-button>-->
+<!--       </el-col>-->
+<!--       <el-col :span="1.5">-->
+<!--         <el-button-->
+<!--           type="warning"-->
+<!--           plain-->
+<!--           icon="el-icon-download"-->
+<!--           size="mini"-->
+<!--           @click="handleExport"-->
+<!--           v-hasPermi="['system:skuinv:export']"-->
+<!--         >导出</el-button>-->
+<!--       </el-col>-->
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
     <el-table v-loading="loading" :data="barcodesList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="ID" align="center" prop="id" />
       <el-table-column label="ERP品号" align="center" prop="barcode" />
       <el-table-column label="仓库id" align="center" prop="stockId" />
       <el-table-column label="货架编号" align="center" prop="locationNo" />
       <el-table-column label="栈板号" align="center" prop="boxNo" />
-      <el-table-column label="单位" align="center" prop="lotnum" />
+      <el-table-column label="单位" align="center" prop="userdefine1" />
       <el-table-column label="数量" align="center" prop="qty" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['system:skuinv:edit']"
-          >修改</el-button>
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-            v-hasPermi="['system:skuinv:remove']"
-          >删除</el-button>
-        </template>
-      </el-table-column>
+      <el-table-column label="产品" align="center" prop="sku" />
+      <el-table-column label="产品类型" align="center" prop="skuType" />
+<!--      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">-->
+<!--        <template slot-scope="scope">-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-edit"-->
+<!--            @click="handleUpdate(scope.row)"-->
+<!--            v-hasPermi="['system:barcodesinv:edit']"-->
+<!--          >修改</el-button>-->
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['system:barcodesinv:remove']"-->
+<!--          >删除</el-button>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     
     <pagination
@@ -190,7 +191,10 @@ export default {
         locationNo: null,
         boxNo: null,
         lotnum: null,
+        userdefine1: null,
         qty: null,
+        sku: null,
+        skuType: null,
         type: null,
         erpNo: null,
         erpName: null,
@@ -233,6 +237,7 @@ export default {
         locationNo: null,
         boxNo: null,
         lotnum: null,
+        userdefine1: null,
         qty: null,
         type: null,
         erpNo: null,

warewms-ams/src/main/java/com/ruoyi/ams/asn/service/impl/WmsDocAsnHeaderServiceImpl.java

@@ -11,33 +11,24 @@ import com.ruoyi.ams.asn.vo.SearchStockVO;
 import com.ruoyi.ams.box.domain.WmsBoxInfo;
 import com.ruoyi.ams.box.service.IWmsBoxInfoService;
 import com.ruoyi.ams.business.IBusinessService;
-import com.ruoyi.ams.config.domain.dto.AgvCallDTO;
 import com.ruoyi.ams.config.domain.dto.LotattDTO;
-import com.ruoyi.ams.config.domain.vo.FlowConfigHeaderVO;
 import com.ruoyi.ams.config.service.IFlowConfigHeaderService;
 import com.ruoyi.ams.erp.domain.ErpBarcodes;
 import com.ruoyi.ams.erp.domain.ErpOrderList;
 import com.ruoyi.ams.erp.service.IErpBarcodesService;
-import com.ruoyi.ams.inv.domain.ActTransactionLog;
 import com.ruoyi.ams.inv.domain.InvLotAtt;
 import com.ruoyi.ams.inv.domain.InvLotLocId;
-import com.ruoyi.ams.inv.domain.form.InvLocIdSearchFrom;
-import com.ruoyi.ams.inv.domain.form.InvLotLocIdMoveForm;
 import com.ruoyi.ams.inv.domain.vo.InvLotLocIdLotattVO;
 import com.ruoyi.ams.inv.mapper.InvLotLocIdMapper;
 import com.ruoyi.ams.inv.service.IActTransactionLogService;
 import com.ruoyi.ams.inv.service.IInvLotAttService;
 import com.ruoyi.ams.inv.service.IInvLotLocIdService;
-import com.ruoyi.ams.order.domain.ActAllocationDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderDetails;
 import com.ruoyi.ams.order.domain.WmsDocOrderHeader;
 import com.ruoyi.ams.order.dto.WmsDocOrderDTO;
 import com.ruoyi.ams.order.mapper.WmsDocOrderDetailsMapper;
 import com.ruoyi.ams.order.service.IActAllocationDetailsService;
-import com.ruoyi.ams.order.service.IWmsDocOrderDetailsService;
 import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
-import com.ruoyi.ams.task.domain.WcsTask;
-import com.ruoyi.ams.task.service.IWcsTaskService;
 import com.ruoyi.base.constant.Constant;
 import com.ruoyi.base.domain.BaseLocationInfo;
 import com.ruoyi.base.domain.BaseSku;
@@ -52,7 +43,6 @@ import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.exception.ServiceException;
 import com.ruoyi.common.utils.DateUtils;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.uuid.SnowflakeIdWorker;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -62,7 +52,6 @@ import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
 import com.ruoyi.ams.asn.mapper.WmsDocAsnHeaderMapper;
 import com.ruoyi.ams.asn.domain.WmsDocAsnHeader;
 import com.ruoyi.ams.asn.service.IWmsDocAsnHeaderService;
-import sun.jvm.hotspot.gc_implementation.g1.HeapRegionSetBase;
 
 /**
  * 入库单Service业务层处理
@@ -707,22 +696,25 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService {
             WmsDocAsnDetails details = new WmsDocAsnDetails();
             details.setAsnNo(asnNo);
             details.setAsnLineNo(Long.valueOf(index));
-            details.setSku(erpOrder.getIma01());
+            details.setSku(erpOrder.getIma01());            //品号
             details.setReceivedQty(BigDecimal.ZERO);
             details.setReceivedQtyEach(BigDecimal.ZERO);
-            details.setExpectedQtyEach(erpOrder.getQty());
+            details.setExpectedQtyEach(erpOrder.getQty());  //数量
             details.setExpectedQtyEach(erpOrder.getQty());
             details.setCreateTime(new Date());
             details.setCreateBy(erpOrder.getCreateUser());
-            details.setdEdi04(erpOrder.getVaild());
-            details.setdEdi05(erpOrder.getStockId());
-            details.setdEdi06(erpOrder.getOrderState());
+            details.setdEdi04(erpOrder.getVaild());         //单据状态
+            details.setdEdi05(erpOrder.getStockId());       //仓库编号
+            details.setdEdi06(erpOrder.getOrderState());    //是否扫描完成
+            details.setdEdi07(erpOrder.getOrderNo()+"");    //项次
+            details.setdEdi08(erpOrder.getOrderType());     //erp单据类型
+            details.setdEdi09(erpOrder.getInout());         //erp出入库类型
             wmsDocAsnDetailsMapper.insertWmsDocAsnDetails(details);
             index++;
         }
         WmsDocAsnHeader wmsDocAsnHeader = new WmsDocAsnHeader();
         wmsDocAsnHeader.setAsnNo(asnNo);
-        wmsDocAsnHeader.setAsnReference1(orderName);
+        wmsDocAsnHeader.setAsnReference1(orderName);        //erp单号
         wmsDocAsnHeader.setCreateBy("ERP");
         wmsDocAsnHeader.setCreateTime(new Date());
         wmsDocAsnHeader.setAsnStatus("00");

warewms-ams/src/main/java/com/ruoyi/ams/erp/mapper/ErpBarcodesInvMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.erp.mapper;
 
 import com.ruoyi.ams.erp.domain.ErpBarcodes;
+import com.ruoyi.ams.order.erp.ErpBarCodesVO;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@ public interface ErpBarcodesInvMapper
      * 查询条码库存记录表列表
      *
      */
-     List<ErpBarcodes> selectErpBarcodesList(ErpBarcodes erpBarcodes);
+     List<ErpBarCodesVO> selectErpBarcodesList(ErpBarcodes erpBarcodes);
 
     /**
      * 新增条码库存记录表

warewms-ams/src/main/java/com/ruoyi/ams/erp/mapper/ErpBarcodesMapper.java

@@ -22,7 +22,7 @@ public interface ErpBarcodesMapper
 
     /**
      * 查询条码扫描记录表列表
-     * 
+     *
      * @param erpBarcodes 条码扫描记录表
      * @return 条码扫描记录表集合
      */

warewms-ams/src/main/java/com/ruoyi/ams/erp/mapper/ErpSkuInvMapper.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.erp.mapper;
 
 import com.ruoyi.ams.erp.domain.ErpBarcodes;
+import com.ruoyi.ams.order.erp.ErpBarCodesVO;
 
 import java.util.List;
 
@@ -22,7 +23,7 @@ public interface ErpSkuInvMapper
      * 查询产品库存记录
      *
      */
-     List<ErpBarcodes> selectErpBarcodesList(ErpBarcodes erpBarcodes);
+     List<ErpBarCodesVO> selectErpBarcodesList(ErpBarcodes erpBarcodes);
 
     /**
      * 新增产品库存记录

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/IErpBarcodesInvService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.erp.service;
 
 import com.ruoyi.ams.erp.domain.ErpBarcodes;
+import com.ruoyi.ams.order.erp.ErpBarCodesVO;
 
 import java.util.List;
 
@@ -22,13 +23,13 @@ public interface IErpBarcodesInvService
      * 查询条码库存记录表列表
      *
      */
-     List<ErpBarcodes> selectErpBarcodesList(ErpBarcodes erpBarcodes);
+     List<ErpBarCodesVO> selectErpBarcodesList(ErpBarcodes erpBarcodes);
 
     /**
      * 查询条码库存记录表
      *
      */
-    ErpBarcodes selectErpBarcodesByModel(ErpBarcodes erpBarcodes);
+    ErpBarCodesVO selectErpBarcodesByModel(ErpBarcodes erpBarcodes);
 
     /**
      * 新增条码库存记录表

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/IErpSkuInvService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.ams.erp.service;
 
 import com.ruoyi.ams.erp.domain.ErpBarcodes;
+import com.ruoyi.ams.order.erp.ErpBarCodesVO;
 
 import java.util.List;
 
@@ -22,13 +23,13 @@ public interface IErpSkuInvService
      * 查询产品库存记录
      *
      */
-     List<ErpBarcodes> selectErpBarcodesList(ErpBarcodes erpBarcodes);
+     List<ErpBarCodesVO> selectErpBarcodesList(ErpBarcodes erpBarcodes);
 
     /**
      * 查询产品库存记录
      *
      */
-    ErpBarcodes selectErpBarcodesByModel(ErpBarcodes erpBarcodes);
+    ErpBarCodesVO selectErpBarcodesByModel(ErpBarcodes erpBarcodes);
 
     /**
      * 新增产品库存记录

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/impl/ErpBarcodesInvServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.ams.erp.service.impl;
 import com.ruoyi.ams.erp.domain.ErpBarcodes;
 import com.ruoyi.ams.erp.mapper.ErpBarcodesInvMapper;
 import com.ruoyi.ams.erp.service.IErpBarcodesInvService;
+import com.ruoyi.ams.order.erp.ErpBarCodesVO;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -36,7 +37,7 @@ public class ErpBarcodesInvServiceImpl implements IErpBarcodesInvService
      *
      */
     @Override
-    public List<ErpBarcodes> selectErpBarcodesList(ErpBarcodes erpBarcodes)
+    public List<ErpBarCodesVO> selectErpBarcodesList(ErpBarcodes erpBarcodes)
     {
         return erpBarcodesInvMapper.selectErpBarcodesList(erpBarcodes);
     }
@@ -46,9 +47,9 @@ public class ErpBarcodesInvServiceImpl implements IErpBarcodesInvService
      *
      */
     @Override
-    public ErpBarcodes selectErpBarcodesByModel(ErpBarcodes erpBarcodes)
+    public ErpBarCodesVO selectErpBarcodesByModel(ErpBarcodes erpBarcodes)
     {
-        List<ErpBarcodes> list = erpBarcodesInvMapper.selectErpBarcodesList(erpBarcodes);
+        List<ErpBarCodesVO> list = erpBarcodesInvMapper.selectErpBarcodesList(erpBarcodes);
         if (list!=null && list.size()>0) {
             return list.get(0);
         } else {

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/impl/ErpSkuInvServiceImpl.java

@@ -4,6 +4,7 @@ import com.ruoyi.ams.erp.domain.ErpBarcodes;
 import com.ruoyi.ams.erp.mapper.ErpSkuInvMapper;
 import com.ruoyi.ams.erp.service.IErpBarcodesInvService;
 import com.ruoyi.ams.erp.service.IErpSkuInvService;
+import com.ruoyi.ams.order.erp.ErpBarCodesVO;
 import com.ruoyi.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -37,7 +38,7 @@ public class ErpSkuInvServiceImpl implements IErpSkuInvService
      *
      */
     @Override
-    public List<ErpBarcodes> selectErpBarcodesList(ErpBarcodes erpBarcodes)
+    public List<ErpBarCodesVO> selectErpBarcodesList(ErpBarcodes erpBarcodes)
     {
         return erpSkuInvMapper.selectErpBarcodesList(erpBarcodes);
     }
@@ -47,9 +48,9 @@ public class ErpSkuInvServiceImpl implements IErpSkuInvService
      *
      */
     @Override
-    public ErpBarcodes selectErpBarcodesByModel(ErpBarcodes erpBarcodes)
+    public ErpBarCodesVO selectErpBarcodesByModel(ErpBarcodes erpBarcodes)
     {
-        List<ErpBarcodes> list = erpSkuInvMapper.selectErpBarcodesList(erpBarcodes);
+        List<ErpBarCodesVO> list = erpSkuInvMapper.selectErpBarcodesList(erpBarcodes);
         if (list!=null && list.size()>0) {
             return list.get(0);
         } else {

warewms-ams/src/main/java/com/ruoyi/ams/erp/service/impl/SyncServiceImpl.java

@@ -4,10 +4,6 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.ams.asn.service.IWmsDocAsnHeaderService;
 import com.ruoyi.ams.erp.domain.ErpOrderList;
-import com.ruoyi.ams.erp.domain.ErpProBarCode;
-import com.ruoyi.ams.erp.domain.ErpProOb;
-import com.ruoyi.ams.erp.domain.ErpProType;
-import com.ruoyi.ams.erp.mapper.ErpBusinessMapper;
 import com.ruoyi.ams.erp.service.ISyncService;
 import com.ruoyi.ams.order.service.IWmsDocOrderHeaderService;
 import com.ruoyi.base.constant.Constant;
@@ -17,7 +13,6 @@ import com.ruoyi.base.domain.CodeSkuRelationship;
 import com.ruoyi.base.service.IBaseSkuService;
 import com.ruoyi.base.service.IBaseSkuTypeService;
 import com.ruoyi.base.service.ICodeSkuRelationshipService;
-import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.exception.ServiceException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -32,8 +27,7 @@ import java.util.Map;
 @Service
 public class SyncServiceImpl implements ISyncService {
 
-    @Autowired
-    private ErpBusinessMapper erpBusinessMapper;
+
     @Autowired
     private IBaseSkuTypeService baseSkuTypeService;
     @Autowired
@@ -54,8 +48,8 @@ public class SyncServiceImpl implements ISyncService {
         if (list != null && list.size() > 0) {
             for (JSONObject erpProType : list) {
                 BaseSkuType baseSkuType = new BaseSkuType();
-                baseSkuType.setItemName(erpProType.getString("typeDesc"));
-                baseSkuType.setRemark(erpProType.getString("typeId"));
+                baseSkuType.setItemName(erpProType.getString("typeDesc"));  //说明
+                baseSkuType.setRemark(erpProType.getString("typeId"));      //编号
                 baseSkuType.setParentCode("0");
                 baseSkuType.setStatus("0");
                 baseSkuTypeService.saveOrUpdate(baseSkuType);
@@ -77,12 +71,13 @@ public class SyncServiceImpl implements ISyncService {
                 }
                 BaseSku baseSku = new BaseSku();
                 baseSku.setCustomerId(Constant.CUSTOMER_ID);
-                baseSku.setSku(jsonObject.getString("ima01"));
-                baseSku.setDesc1(jsonObject.getString("ima02"));
-                baseSku.setModel(jsonObject.getString("ima021"));
-                baseSku.setUserdefine1(jsonObject.getString("ima25"));
-                baseSku.setUserdefine2(jsonObject.getString("ima930"));
-                baseSku.setSkuType(skuType.getItemCode().toString());
+                baseSku.setSku(jsonObject.getString("ima01"));          //品号
+                baseSku.setDesc1(jsonObject.getString("ima02"));        //品名
+                baseSku.setModel(jsonObject.getString("ima021"));       //规格
+                baseSku.setUserdefine1(jsonObject.getString("ima25"));  //单位
+                baseSku.setUserdefine2(jsonObject.getString("ima930")); //有无条码
+                baseSku.setSkuType(skuType.getItemCode().toString());       //产品分类
+                baseSku.setStatus(jsonObject.getString("valid"));       //是否有效
                 baseSkuService.saveOrUpdate(baseSku);
             }
             redisTemplate.delete("erpProOb");
@@ -96,9 +91,9 @@ public class SyncServiceImpl implements ISyncService {
         if (list != null && list.size() > 0) {
             for (JSONObject code : list) {
                 CodeSkuRelationship codeSkuRelationship = new CodeSkuRelationship();
-                codeSkuRelationship.setSn(code.getString("barcode"));
-                codeSkuRelationship.setSku(code.getString("ima01"));
-                codeSkuRelationship.setStatus(code.getString("valid"));
+                codeSkuRelationship.setSn(code.getString("barcode"));           //条码
+                codeSkuRelationship.setSku(code.getString("ima01"));            //品号
+                codeSkuRelationship.setStatus(code.getString("valid"));         //是否有效
                 codeSkuRelationshipService.saveOrUpdate(codeSkuRelationship);
             }
             redisTemplate.delete("erpBarCode");

warewms-ams/src/main/java/com/ruoyi/ams/order/domain/WmsDocOrderDetails.java

@@ -220,11 +220,11 @@ public class WmsDocOrderDetails extends BaseEntity
 
     /**  */
     @Excel(name = "")
-    private BigDecimal dEdi09;
+    private String dEdi09;
 
     /**  */
     @Excel(name = "")
-    private BigDecimal dEdi10;
+    private String dEdi10;
 
     /**  */
     @Excel(name = "")
@@ -757,21 +757,21 @@ public class WmsDocOrderDetails extends BaseEntity
     {
         return dEdi08;
     }
-    public void setdEdi09(BigDecimal dEdi09) 
+    public void setdEdi09(String dEdi09)
     {
         this.dEdi09 = dEdi09;
     }
 
-    public BigDecimal getdEdi09() 
+    public String getdEdi09()
     {
         return dEdi09;
     }
-    public void setdEdi10(BigDecimal dEdi10) 
+    public void setdEdi10(String dEdi10)
     {
         this.dEdi10 = dEdi10;
     }
 
-    public BigDecimal getdEdi10() 
+    public String getdEdi10()
     {
         return dEdi10;
     }

warewms-ams/src/main/java/com/ruoyi/ams/order/erp/ErpBarCodesVO.java

@@ -0,0 +1,17 @@
+package com.ruoyi.ams.order.erp;
+
+import lombok.Data;
+
+
+@Data
+public class ErpBarCodesVO {
+    private String stockId;     //仓库id
+    private String locationNo;  //货架编号
+    private String boxNo;       //栈板号
+    private String userdefine1;      //单位
+    private String qty;         //数量
+    private String lotatt02;    //条码号
+    private String sku;         //产品
+    private String skuType;     //产品类型
+    private String barcode;     //ERP品号
+}

warewms-ams/src/main/java/com/ruoyi/ams/order/service/impl/WmsDocOrderHeaderServiceImpl.java

@@ -881,10 +881,13 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             details.setQtyPickedEach(BigDecimal.ZERO);
             details.setQtyPacked(BigDecimal.ZERO);
             details.setQtyPackedEach(BigDecimal.ZERO);
-            details.setSku(erpOrder.getIma01());
-            details.setdEdi04(erpOrder.getVaild());
-            details.setdEdi05(erpOrder.getStockId());
-            details.setdEdi06(erpOrder.getOrderState());
+            details.setSku(erpOrder.getIma01());            //品号
+            details.setdEdi04(erpOrder.getVaild());         //单据状态
+            details.setdEdi05(erpOrder.getStockId());       //仓库编号
+            details.setdEdi06(erpOrder.getOrderState());    //是否扫描完成
+            details.setdEdi07(erpOrder.getOrderNo()+"");    //项次
+            details.setdEdi08(erpOrder.getOrderType());     //erp单据类型
+            details.setdEdi09(erpOrder.getInout());         //erp出入库类型
             details.setLineStatus("00");
             details.setCreateTime(new Date());
             details.setCreateBy(erpOrder.getCreateUser());
@@ -892,7 +895,7 @@ public class WmsDocOrderHeaderServiceImpl implements IWmsDocOrderHeaderService {
             index++;
         }
         WmsDocOrderHeader orderHeader = new WmsDocOrderHeader();
-        orderHeader.setOrderNo(orderNo);
+        orderHeader.setOrderNo(orderNo);            //erp单号
         orderHeader.setOrderType("OD");
         orderHeader.setOrderStatus("00");
         orderHeader.setCustomerId(Constant.CUSTOMER_ID);

warewms-ams/src/main/resources/mapper/erp/ErpBarcodesInvMapper.xml

@@ -29,13 +29,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userdefine7"    column="userdefine7"    />
         <result property="userdefine8"    column="userdefine8"    />
     </resultMap>
+    <resultMap type="com.ruoyi.ams.order.erp.ErpBarCodesVO" id="ErpBarcodesVOResult">
+        <result property="stockId" column="stockId"></result>
+        <result property="locationNo" column="locationNo"></result>
+        <result property="boxNo" column="boxNo"></result>
+        <result property="lotnum" column="lotnum"></result>
+        <result property="qty" column="qty"></result>
+        <result property="lotatt02" column="lotatt02"></result>
+        <result property="sku" column="sku"></result>
+        <result property="skuType" column="skuType"></result>
+        <result property="barcode" column="barcode"></result>
+    </resultMap>
 
     <sql id="selectErpBarcodesVo">
         select id, barcode, stock_id, location_no, box_no, lotnum, qty, type, erp_no, erp_name, erp_type, create_time, create_by, update_time, update_by, userdefine1, userdefine2, userdefine3, userdefine4, userdefine5, userdefine6, userdefine7, userdefine8 from erp_barcodes
     </sql>
 
-    <select id="selectErpBarcodesList" parameterType="ErpBarcodes" resultMap="ErpBarcodesResult">
-        <include refid="selectErpBarcodesVo"/>
+    <select id="selectErpBarcodesList"  resultMap="ErpBarcodesVOResult">
+        select csr.sn as lotatt02,eb.stock_id as stockId,bli.location_no as locationNo,eb.box_no as boxNo,illa.lotnum as lotnum,illa.qty as qty
+        from inv_lot_loc_id illa
+        LEFT JOIN inv_lot_att ila on ila.lotnum = illa.lotnum
+        LEFT JOIN base_location_info bli on bli.id = illa.location_id
+        LEFT JOIN erp_barcodes eb on eb.lotnum = illa.lotnum
+        LEFT JOIN code_sku_relationship csr on csr.sn = ila.lotatt02
         <where>  
             <if test="barcode != null  and barcode != ''"> and barcode = #{barcode}</if>
             <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>

warewms-ams/src/main/resources/mapper/erp/ErpSkuInvMapper.xml

@@ -29,13 +29,29 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="userdefine7"    column="userdefine7"    />
         <result property="userdefine8"    column="userdefine8"    />
     </resultMap>
+    <resultMap type="com.ruoyi.ams.order.erp.ErpBarCodesVO" id="ErpBarcodesVOResult">
+        <result property="stockId" column="stockId"></result>
+        <result property="locationNo" column="locationNo"></result>
+        <result property="boxNo" column="boxNo"></result>
+        <result property="userdefine1" column="userdefine1"></result>
+        <result property="qty" column="qty"></result>
+        <result property="lotatt02" column="lotatt02"></result>
+        <result property="sku" column="sku"></result>
+        <result property="skuType" column="skuType"></result>
+        <result property="barcode" column="barcode"></result>
+    </resultMap>
 
     <sql id="selectErpBarcodesVo">
         select id, barcode, stock_id, location_no, box_no, lotnum, qty, type, erp_no, erp_name, erp_type, create_time, create_by, update_time, update_by, userdefine1, userdefine2, userdefine3, userdefine4, userdefine5, userdefine6, userdefine7, userdefine8 from erp_barcodes
     </sql>
 
-    <select id="selectErpBarcodesList" parameterType="ErpBarcodes" resultMap="ErpBarcodesResult">
-        <include refid="selectErpBarcodesVo"/>
+    <select id="selectErpBarcodesList"  resultMap="ErpBarcodesVOResult">
+        select eb.erp_no as barcode,eb.stock_id as stockId,bli.location_no as locationNo,eb.box_no as boxNo,illa.lotnum as userdefine1,illa.qty as qty,bs.sku as sku,bst.item_name as skuType
+        from inv_lot_loc_id illa
+        LEFT JOIN base_sku bs on bs.sku = illa.sku
+        LEFT JOIN base_sku_type bst on bst.item_code = bs.sku_type
+        LEFT JOIN base_location_info bli on bli.id = illa.location_id
+        LEFT JOIN erp_barcodes eb on eb.lotnum = illa.lotnum
         <where>  
             <if test="barcode != null  and barcode != ''"> and barcode = #{barcode}</if>
             <if test="stockId != null  and stockId != ''"> and stock_id = #{stockId}</if>

warewms-base/src/main/java/com/ruoyi/base/domain/BaseSku.java

@@ -34,6 +34,10 @@ public class BaseSku extends BaseEntity
     @Excel(name = "型号")
     private String model;
 
+    /** 有效否 */
+    @Excel(name = "有效否")
+    private String status;
+
     /** 描述1 */
     @Excel(name = "描述1")
     private String desc1;
@@ -242,6 +246,16 @@ public class BaseSku extends BaseEntity
         this.desc1 = desc1;
     }
 
+    public void setStatus(String status)
+    {
+        this.status = status;
+    }
+
+    public String getStatus()
+    {
+        return status;
+    }
+
     public String getDesc1() 
     {
         return desc1;
@@ -606,6 +620,7 @@ public class BaseSku extends BaseEntity
             .append("skuType", getSkuType())
             .append("specs", getSpecs())
             .append("model", getModel())
+            .append("status",getStatus())
             .append("desc1", getDesc1())
             .append("desc2", getDesc2())
             .append("selfCode1", getSelfCode1())