From 34981c30a78e8bbd7791131059a9210f9928b62c Mon Sep 17 00:00:00 2001
From: 刘光辉 <347230014@qq.com>
Date: 星期四, 17 九月 2026 09:24:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/service/impl/SalesOrderServiceImpl.java |  139 ++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 139 insertions(+), 0 deletions(-)

diff --git a/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/service/impl/SalesOrderServiceImpl.java b/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/service/impl/SalesOrderServiceImpl.java
new file mode 100644
index 0000000..9573dbf
--- /dev/null
+++ b/jnpf-lims/jnpf-lims-biz/src/main/java/jnpf/service/impl/SalesOrderServiceImpl.java
@@ -0,0 +1,139 @@
+package jnpf.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import jnpf.base.BillRuleApi;
+import jnpf.base.service.SuperServiceImpl;
+import jnpf.entity.SalesOrderEntity;
+import jnpf.entity.SalesOrderEntryEntity;
+import jnpf.mapper.SalesOrderEntryMapper;
+import jnpf.mapper.SalesOrderMapper;
+import jnpf.model.salesorder.SalesOrderEntryEntityInfoModel;
+import jnpf.model.salesorder.SalesOrderForm;
+import jnpf.service.SalesOrderService;
+import jnpf.util.JsonUtil;
+import jnpf.util.RandomUtil;
+import jnpf.util.StringUtil;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 閿�鍞鍗�
+ *
+ * @author JNPF寮�鍙戝钩鍙扮粍
+ * @version V3.1.0
+ * @copyright 寮曡繄淇℃伅鎶�鏈湁闄愬叕鍙�
+ * @date 2019骞�9鏈�29鏃� 涓婂崍9:18
+ */
+@Service
+@RequiredArgsConstructor
+public class SalesOrderServiceImpl extends SuperServiceImpl<SalesOrderMapper, SalesOrderEntity> implements SalesOrderService {
+
+
+    private final BillRuleApi billRuleApi;
+    private final SalesOrderEntryMapper salesOrderEntryMapper;
+
+    @Override
+    public List<SalesOrderEntryEntity> getSalesEntryList(String id) {
+        QueryWrapper<SalesOrderEntryEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SalesOrderEntryEntity::getSalesOrderId, id).orderByDesc(SalesOrderEntryEntity::getSortCode);
+        return salesOrderEntryMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public SalesOrderEntity getInfo(String id) {
+        return this.baseMapper.getInfo(id);
+    }
+
+    @Override
+    @DSTransactional
+    public void save(String id, SalesOrderEntity entity, List<SalesOrderEntryEntity> salesOrderEntryEntityList, SalesOrderForm form) {
+        //琛ㄥ崟淇℃伅
+        if (StringUtil.isEmpty(entity.getId())) {
+            entity.setId(id);
+            for (int i = 0; i < salesOrderEntryEntityList.size(); i++) {
+                salesOrderEntryEntityList.get(i).setId(RandomUtil.uuId());
+                salesOrderEntryEntityList.get(i).setSalesOrderId(entity.getId());
+                salesOrderEntryEntityList.get(i).setSortCode(Long.parseLong(i + ""));
+                salesOrderEntryMapper.insert(salesOrderEntryEntityList.get(i));
+            }
+            //鍒涘缓
+            save(entity);
+            billRuleApi.useBillNumber("WF_SalesOrderNo");
+        } else {
+            entity.setId(id);
+            QueryWrapper<SalesOrderEntryEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(SalesOrderEntryEntity::getSalesOrderId, entity.getId());
+            salesOrderEntryMapper.delete(queryWrapper);
+            for (int i = 0; i < salesOrderEntryEntityList.size(); i++) {
+                salesOrderEntryEntityList.get(i).setId(RandomUtil.uuId());
+                salesOrderEntryEntityList.get(i).setSalesOrderId(entity.getId());
+                salesOrderEntryEntityList.get(i).setSortCode(Long.parseLong(i + ""));
+                salesOrderEntryMapper.insert(salesOrderEntryEntityList.get(i));
+            }
+            //缂栬緫
+            updateById(entity);
+        }
+    }
+
+    @Override
+    @DSTransactional
+    public void submit(String id, SalesOrderEntity entity, List<SalesOrderEntryEntity> salesOrderEntryEntityList, SalesOrderForm form) {
+        //琛ㄥ崟淇℃伅
+        if (StringUtil.isEmpty(entity.getId())) {
+            entity.setId(id);
+            for (int i = 0; i < salesOrderEntryEntityList.size(); i++) {
+                salesOrderEntryEntityList.get(i).setId(RandomUtil.uuId());
+                salesOrderEntryEntityList.get(i).setSalesOrderId(entity.getId());
+                salesOrderEntryEntityList.get(i).setSortCode(Long.parseLong(i + ""));
+                salesOrderEntryMapper.insert(salesOrderEntryEntityList.get(i));
+            }
+            //鍒涘缓
+            save(entity);
+            billRuleApi.useBillNumber("WF_SalesOrderNo");
+        } else {
+            entity.setId(id);
+            QueryWrapper<SalesOrderEntryEntity> queryWrapper = new QueryWrapper<>();
+            queryWrapper.lambda().eq(SalesOrderEntryEntity::getSalesOrderId, entity.getId());
+            salesOrderEntryMapper.delete(queryWrapper);
+            for (int i = 0; i < salesOrderEntryEntityList.size(); i++) {
+                salesOrderEntryEntityList.get(i).setId(RandomUtil.uuId());
+                salesOrderEntryEntityList.get(i).setSalesOrderId(entity.getId());
+                salesOrderEntryEntityList.get(i).setSortCode(Long.parseLong(i + ""));
+                salesOrderEntryMapper.insert(salesOrderEntryEntityList.get(i));
+            }
+            //缂栬緫
+            updateById(entity);
+        }
+    }
+
+    @Override
+    public void data(String id, String data) {
+        SalesOrderForm salesOrderForm = JsonUtil.getJsonToBean(data, SalesOrderForm.class);
+        SalesOrderEntity entity = JsonUtil.getJsonToBean(salesOrderForm, SalesOrderEntity.class);
+        List<SalesOrderEntryEntityInfoModel> entryList = salesOrderForm.getEntryList() != null ? salesOrderForm.getEntryList() : new ArrayList<>();
+        List<SalesOrderEntryEntity> salesOrderEntryEntityList = JsonUtil.getJsonToList(entryList, SalesOrderEntryEntity.class);
+        entity.setId(id);
+        QueryWrapper<SalesOrderEntryEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.lambda().eq(SalesOrderEntryEntity::getSalesOrderId, entity.getId());
+        salesOrderEntryMapper.delete(queryWrapper);
+        for (int i = 0; i < salesOrderEntryEntityList.size(); i++) {
+            salesOrderEntryEntityList.get(i).setId(RandomUtil.uuId());
+            salesOrderEntryEntityList.get(i).setSalesOrderId(entity.getId());
+            salesOrderEntryEntityList.get(i).setSortCode(Long.parseLong(i + ""));
+            salesOrderEntryMapper.insert(salesOrderEntryEntityList.get(i));
+        }
+        //缂栬緫
+        saveOrUpdate(entity);
+    }
+
+    @Override
+    public void delete(SalesOrderEntity entity) {
+        this.baseMapper.delete(entity);
+    }
+
+}

--
Gitblit v1.8.0