出入库单

ruoyi-admin/src/main/java/com/ruoyi/web/controller/warewms/asn/WmsDocAsnHeaderController.java

@@ -29,14 +29,13 @@ import com.ruoyi.common.core.page.TableDataInfo;
 
 /**
  * 入库单Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-10-12
  */
 @RestController
 @RequestMapping("/docAsn/docAsn")
-public class WmsDocAsnHeaderController extends BaseController
-{
+public class WmsDocAsnHeaderController extends BaseController {
     @Autowired
     private IWmsDocAsnHeaderService wmsDocAsnHeaderService;
     @Autowired
@@ -47,8 +46,7 @@ public class WmsDocAsnHeaderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:list')")
     @GetMapping("/list")
-    public TableDataInfo list(WmsDocAsnHeader wmsDocAsnHeader)
-    {
+    public TableDataInfo list(WmsDocAsnHeader wmsDocAsnHeader) {
         startPage();
         List<WmsDocAsnHeader> list = wmsDocAsnHeaderService.selectWmsDocAsnHeaderList(wmsDocAsnHeader);
         return getDataTable(list);
@@ -60,8 +58,7 @@ public class WmsDocAsnHeaderController extends BaseController
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:export')")
     @Log(title = "入库单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, WmsDocAsnHeader wmsDocAsnHeader)
-    {
+    public void export(HttpServletResponse response, WmsDocAsnHeader wmsDocAsnHeader) {
         List<WmsDocAsnHeader> list = wmsDocAsnHeaderService.selectWmsDocAsnHeaderList(wmsDocAsnHeader);
         ExcelUtil<WmsDocAsnHeader> util = new ExcelUtil<WmsDocAsnHeader>(WmsDocAsnHeader.class);
         util.exportExcel(response, list, "入库单数据");
@@ -72,8 +69,7 @@ public class WmsDocAsnHeaderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:query')")
     @GetMapping(value = "/{asnNo}")
-    public AjaxResult getInfo(@PathVariable("asnNo") String asnNo)
-    {
+    public AjaxResult getInfo(@PathVariable("asnNo") String asnNo) {
         return AjaxResult.success(wmsDocAsnHeaderService.selectWmsDocAsnHeaderByAsnNo(asnNo));
     }
 
@@ -83,8 +79,7 @@ public class WmsDocAsnHeaderController extends BaseController
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:add')")
     @Log(title = "入库单", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody WmsDocAsnHeader wmsDocAsnHeader)
-    {
+    public AjaxResult add(@RequestBody WmsDocAsnHeader wmsDocAsnHeader) {
         return toAjax(wmsDocAsnHeaderService.insertWmsDocAsnHeader(wmsDocAsnHeader));
     }
 
@@ -94,8 +89,7 @@ public class WmsDocAsnHeaderController extends BaseController
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:edit')")
     @Log(title = "入库单", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody WmsDocAsnHeader wmsDocAsnHeader)
-    {
+    public AjaxResult edit(@RequestBody WmsDocAsnHeader wmsDocAsnHeader) {
         return toAjax(wmsDocAsnHeaderService.updateWmsDocAsnHeader(wmsDocAsnHeader));
     }
 
@@ -104,9 +98,8 @@ public class WmsDocAsnHeaderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:remove')")
     @Log(title = "入库单", businessType = BusinessType.DELETE)
-	@DeleteMapping("/{asnNos}")
-    public AjaxResult remove(@PathVariable String[] asnNos)
-    {
+    @DeleteMapping("/{asnNos}")
+    public AjaxResult remove(@PathVariable String[] asnNos) {
         return toAjax(wmsDocAsnHeaderService.deleteWmsDocAsnHeaderByAsnNos(asnNos));
     }
 
@@ -116,8 +109,10 @@ public class WmsDocAsnHeaderController extends BaseController
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:add')")
     @Log(title = "入库单", businessType = BusinessType.INSERT)
     @PostMapping("addDocAsnDetails")
-    public AjaxResult addDocAsnDetails(@RequestBody WmsDocAsnDetails wmsDocAsnDetails)
-    {
+    public AjaxResult addDocAsnDetails(@RequestBody WmsDocAsnDetails wmsDocAsnDetails) {
+        LoginUser loginUser = getLoginUser();
+        wmsDocAsnDetails.setCreateBy(loginUser.getUsername());
+        wmsDocAsnDetails.setCreateTime(new Date());
         return toAjax(wmsDocAsnHeaderService.insertWmsDocAsnDetails(wmsDocAsnDetails));
     }
 
@@ -127,8 +122,7 @@ public class WmsDocAsnHeaderController extends BaseController
     @PreAuthorize("@ss.hasPermi('docAsn:docAsn:add')")
     @Log(title = "入库单", businessType = BusinessType.INSERT)
     @PostMapping("addDocAsnHeader")
-    public AjaxResult addDocAsnHeader(@RequestBody WmsDocAsnHeader wmsDocAsnHeader)
-    {
+    public AjaxResult addDocAsnHeader(@RequestBody WmsDocAsnHeader wmsDocAsnHeader) {
         int result = wmsDocAsnHeaderService.insertWmsDocAsnHeader(wmsDocAsnHeader);
         return toAjax(result);
     }
@@ -138,8 +132,7 @@ public class WmsDocAsnHeaderController extends BaseController
      * 新增入库单明细
      */
     @GetMapping(value = "/initAsnHeader/{asnNo}")
-    public AjaxResult initAsnHeader(@PathVariable("asnNo") String asnNo)
-    {
+    public AjaxResult initAsnHeader(@PathVariable("asnNo") String asnNo) {
         WmsDocAsnHeader docAsnHeader = new WmsDocAsnHeader();
         LoginUser loginUser = getLoginUser();
         if (asnNo == null || "undefine".equals(asnNo)) {
@@ -154,10 +147,16 @@ public class WmsDocAsnHeaderController extends BaseController
             docAsnHeader.setAsnStatus("00");
         } else {
             docAsnHeader = wmsDocAsnHeaderService.selectWmsDocAsnHeaderByAsnNo(asnNo);
-            if(docAsnHeader == null) {
+            if (docAsnHeader == null) {
                 return AjaxResult.error("入库单号不存在");
             }
         }
-        return AjaxResult.success("",docAsnHeader);
+        return AjaxResult.success("", docAsnHeader);
+    }
+
+    @GetMapping(value = "/queryDocAsnDetails/{asnNo}")
+    public AjaxResult queryDocAsnDetails(@PathVariable("asnNo") String asnNo) {
+        List<WmsDocAsnDetails> wmsDocAsnDetails = wmsDocAsnHeaderService.queryWmsDocAsnDetails(asnNo);
+        return AjaxResult.success("", wmsDocAsnDetails);
     }
 }

ruoyi-ui/src/api/docAsn/docAsn.js

@@ -69,3 +69,11 @@ export function addDocAsnHeader(data) {
   })
 }
 
+// 查询入库单明细
+export function queryDocAsnDetails(asnNo) {
+  return request({
+    url: '/docAsn/docAsn/queryDocAsnDetails/' + asnNo,
+    method: 'get'
+  })
+}
+

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

@@ -196,6 +196,7 @@
             console.log(this.dataForm)
             addDocAsnDetails(this.dataForm).then(response => {
               this.$modal.msgSuccess("新增成功");
+              this.visible = false
             });
           }
         });

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

@@ -94,6 +94,7 @@
 <script>
   import AddOrUpdate from './docAsnDetails-add-or-update'
   import { lotattConfigList } from "@/api/ams/config"
+  import { queryDocAsnDetails } from "@/api/docAsn/docAsn"
 
   export default {
     data () {
@@ -126,31 +127,9 @@
       getDataList (asnNo) {
         this.queryParams.asnNo = asnNo
         this.initLotatt()
-        /*if (asnNo) {
-          this.dataForm.asnNo = asnNo
-          this.dataListLoading = true
-          this.$http({
-            url: this.$http.adornUrl('/sys/docAsnDetails/list'),
-            method: 'get',
-            params: this.$http.adornParams({
-              'page': this.pageIndex,
-              'limit': this.pageSize,
-              'asnNo': this.dataForm.asnNo
-            })
-          }).then(({data}) => {
-            if (data && data.code === 0) {
-              this.dataList = data.page.list
-              this.totalPage = data.page.totalCount
-            } else {
-              this.dataList = []
-              this.totalPage = 0
-            }
-            this.dataListLoading = false
-          })
-        } else {
-          this.dataList = []
-          this.totalPage = 0
-        }*/
+        queryDocAsnDetails(asnNo).then(response => {
+           this.dataList = response.data
+        });
       },
       // 多选
       selectionChangeHandle (val) {

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

@@ -46,13 +46,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="产品名称" prop="editUserId">
-            <el-input v-model="dataForm.editUserId" placeholder=""></el-input>
+          <el-form-item label="指定库区" prop="pickZone">
+            <el-input v-model="dataForm.pickZone" placeholder=""></el-input>
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="收货库位" prop="supplierId">
-            <el-input v-model="dataForm.supplierId" placeholder=""></el-input>
+          <el-form-item label="指定库位" prop="location">
+            <el-input v-model="dataForm.location" placeholder=""></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="lotnum" prop="lotnum">
+            <el-input v-model="dataForm.lotnum" placeholder=""></el-input>
           </el-form-item>
         </el-col>
       </el-row>
@@ -116,30 +121,13 @@
         roleList: [],
         id: '',
         dataForm: {
-          createUserId: '',
-          notes: '',
-          supplierId: '',
-          editUserId: '',
-          paNo: '',
-          qcNo: '',
-          userdefine1: '',
-          userdefine2: '',
-          userdefine3: '',
-          editDate: '',
-          userdefine4: '',
-          userdefine5: '',
           orderNo: '',
-          asnReference1: '',
-          asnReference2: '',
           customerId: '',
-          releaseStatus: '',
-          orderType: '',
-          expectedArriveTime: '',
           orderStatus: '',
-          customerNo: '',
-          createDate: '',
-          activeFlag: '',
-          sku: ''
+          sku: '',
+          pickZone: '',
+          location: '',
+          lotnum: ''
         },
         dataRule: {},
         tableOption: [],
@@ -155,7 +143,7 @@
         this.initData()
         this.visible = true
         this.$nextTick(() => {
-            console.log('123123123')
+
         })
       },
       // 表单提交

warewms-ams/src/main/java/com/ruoyi/ams/asn/mapper/WmsDocAsnHeaderMapper.java

@@ -84,4 +84,13 @@ public interface WmsDocAsnHeaderMapper
      * @return 结果
      */
      int deleteWmsDocAsnDetailsByAsnNo(String asnNo);
+
+     long selectLineNo(String asnNo);
+
+    /**
+     * 查询明细
+     * @param asnNo
+     * @return
+     */
+     List<WmsDocAsnDetails> selectWmsDocDetails(String asnNo);
 }

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

@@ -75,4 +75,11 @@ public interface IWmsDocAsnHeaderService
      * @return
      */
      int insertWmsDocAsnDetails(WmsDocAsnDetails wmsDocAsnDetails);
+
+    /**
+     * 查询入库单明细
+     * @param asnNo
+     * @return
+     */
+     List<WmsDocAsnDetails> queryWmsDocAsnDetails(String asnNo);
 }

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

@@ -125,10 +125,17 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService
     @Override
     public int insertWmsDocAsnDetails(WmsDocAsnDetails wmsDocAsnDetails) {
         List<WmsDocAsnDetails> detailsList = new ArrayList<>();
+        long lineNo = wmsDocAsnHeaderMapper.selectLineNo(wmsDocAsnDetails.getAsnNo());
+        wmsDocAsnDetails.setAsnLineNo(lineNo+1);
         detailsList.add(wmsDocAsnDetails);
         return wmsDocAsnHeaderMapper.batchWmsDocAsnDetails(detailsList);
     }
 
+    @Override
+    public List<WmsDocAsnDetails> queryWmsDocAsnDetails(String asnNo) {
+        return wmsDocAsnHeaderMapper.selectWmsDocDetails(asnNo);
+    }
+
     /**
      * 新增入库单体信息
      * 
@@ -144,6 +151,8 @@ public class WmsDocAsnHeaderServiceImpl implements IWmsDocAsnHeaderService
             for (WmsDocAsnDetails wmsDocAsnDetails : wmsDocAsnDetailsList)
             {
                 wmsDocAsnDetails.setAsnNo(asnNo);
+                wmsDocAsnDetails.setExpectedQtyEach(wmsDocAsnDetails.getExpectedQty());
+                wmsDocAsnDetails.setReceivedQtyEach(wmsDocAsnDetails.getReceivedQty());
                 list.add(wmsDocAsnDetails);
             }
             if (list.size() > 0)

warewms-ams/src/main/java/com/ruoyi/ams/asn/vo/WmsDocAsnDetailsVO.java

@@ -0,0 +1,12 @@
+package com.ruoyi.ams.asn.vo;
+
+import com.ruoyi.ams.asn.domain.WmsDocAsnDetails;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class WmsDocAsnDetailsVO extends WmsDocAsnDetails {
+    private String skuName;
+    private String lineStatusName;
+}