From c6820e2cff19f338e70c9b112f19070c240f561a Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 15 一月 2026 12:53:59 +0800
Subject: [PATCH] 完善销售订单出库自动勾选

---
 src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java |   69 ++++++++++++++++++++++++++++++++++
 1 files changed, 69 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
index e0caced..9c1bcb7 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkMastLogServiceImpl.java
@@ -1,12 +1,81 @@
 package com.zy.asrs.service.impl;
 
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.core.common.R;
+import com.core.exception.CoolException;
+import com.zy.asrs.entity.InventoryFlowDto;
+import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.entity.WrkMastLog;
 import com.zy.asrs.mapper.WrkMastLogMapper;
 import com.zy.asrs.service.WrkMastLogService;
+import com.zy.asrs.service.WrkMastService;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.Date;
+import java.util.Map;
+import java.util.Objects;
 
 @Service("wrkMastLogService")
 public class WrkMastLogServiceImpl extends ServiceImpl<WrkMastLogMapper, WrkMastLog> implements WrkMastLogService {
 
+    @Autowired
+    private WrkMastService wrkMastService;
+    @Autowired
+    private WrkMastLogService wrkMastLogService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public boolean save(Integer workNo) {
+        WrkMast mast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", workNo));
+        if (Objects.isNull(mast)) {
+            throw new CoolException("鏁版嵁閿欒锛氫换鍔′笉瀛樺湪锛侊紒");
+        }
+        Date now = new Date();
+        WrkMastLog wrkMastLog = new WrkMastLog();
+        wrkMastLog.setWrkNo(mast.getWrkNo());
+        wrkMastLog.setIoTime(now);
+        wrkMastLog.setWrkSts(Math.toIntExact(mast.getWrkSts()));
+        wrkMastLog.setIoType(mast.getIoType());
+        wrkMastLog.setIoPri(mast.getIoPri()); // 浼樺厛绾�
+        wrkMastLog.setCrnNo(mast.getCrnNo());
+        wrkMastLog.setSourceLocNo(mast.getSourceLocNo());
+        wrkMastLog.setLocNo(mast.getLocNo());
+        wrkMastLog.setBarcode(mast.getBarcode()); // 鎵樼洏鐮�
+        wrkMastLog.setFullPlt(mast.getFullPlt()); // 婊℃澘锛歒
+        wrkMastLog.setPicking(mast.getPicking()); // 鎷f枡
+        wrkMastLog.setExitMk(mast.getExitMk()); // 閫�鍑�
+        wrkMastLog.setEmptyMk(mast.getEmptyMk()); // 绌烘澘
+        wrkMastLog.setLinkMis(mast.getLinkMis());
+        wrkMastLog.setWrkDate(mast.getWrkDate());
+        wrkMastLog.setPic(mast.getPic());
+        // 鎿嶄綔浜哄憳鏁版嵁
+        wrkMastLog.setAppeTime(now);
+        wrkMastLog.setModiTime(now);
+        wrkMastLog.setAppeUser(mast.getAppeUser());
+        wrkMastLog.setModiUser(mast.getModiUser());
+        wrkMastLog.setLogId(mast.getId());
+        boolean res = wrkMastLogService.insert(wrkMastLog);
+
+        if (!res) {
+            throw new CoolException("浠诲姟鏃ュ織淇濆瓨澶辫触锛侊紒");
+        }
+
+        return true;
+    }
+
+    @Override
+    public R inventoryFlowList(Integer curr, Integer limit, Map<String, Object> param) {
+        Page<InventoryFlowDto> page = new Page<>();
+        page.setCurrent(curr);
+        page.setSize(limit);
+        page.setTotal(this.baseMapper.inventoryFlowListCount(param));
+        page.setRecords(this.baseMapper.inventoryFlowList(curr, limit, param));
+        return R.ok(page);
+    }
+
 }

--
Gitblit v1.9.1