From b90435111a9cb88a9302b6ac1f70c6d475452efe Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 11 三月 2024 11:28:53 +0800
Subject: [PATCH] 修改发货库存修改
---
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 94 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 5 deletions(-)
diff --git a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
index 9b49dd0..cee1cc8 100644
--- a/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
+++ b/north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java
@@ -1,14 +1,19 @@
package com.example.erp.service.pp;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.dynamic.datasource.annotation.DS;
+import com.example.erp.entity.pp.FlowCard;
import com.example.erp.entity.sd.OrderGlassDetail;
+import com.example.erp.entity.sd.OrderDetail;
import com.example.erp.mapper.pp.WorkOrderMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.sql.Date;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
@Service
@@ -17,13 +22,92 @@
@Autowired
WorkOrderMapper workOrderMapper;
- public Map<String, Object> defaultDateWork( Date selectTime1,Date selectTime2,Integer state, OrderGlassDetail orderGlassDetail) {
- Map<String, Object> map = new HashMap<>();
- // System.out.println(workOrderMapper.selectWordOrder( selectTime1,selectTime2,state, orderGlassDetail));
- map.put("data", workOrderMapper.selectWordOrder( selectTime1,selectTime2,state, orderGlassDetail));
- // map.put("total", productMapper.getPageTotal(offset, pageSize, glassTypeId, product));
+ public Map<String, Object> defaultDateWork(Date selectTime1, Date selectTime2, Integer state, OrderGlassDetail orderGlassDetail) {
+ Map<String, Object> map = new HashMap<>();
+ // System.out.println(workOrderMapper.selectWordOrder( selectTime1,selectTime2,state, orderGlassDetail));
+ if (state == 1) {
+ map.put("data", workOrderMapper.selectWordOrder(selectTime1, selectTime2, orderGlassDetail));
+ } else {
+ map.put("data", workOrderMapper.selectWordOrderNo(selectTime1, selectTime2, orderGlassDetail));
+ }
+
return map;
}
+ public Map<String, Object> addDateWork(String orderId, OrderDetail orderDetail) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("data", workOrderMapper.addWordOrder(orderId, orderDetail));
+ return map;
+ }
+
+ public Boolean addOrderWorkSv(Map<String, Object> object) {
+ String userName = "";
+ if (object.get("userName") != null) {
+ userName = object.get("userName").toString();
+ }
+
+ char lettr = 'A';
+ char letters = '1';
+ int count = 25;
+ String productIdVl = "";
+
+
+ List<OrderDetail> orderDetaillist = JSONArray.parseArray(JSONObject.toJSONString(object.get("orderdetail")), OrderDetail.class);
+ String orderID = orderDetaillist.get(0).getOrderId();
+
+ if (!orderDetaillist.isEmpty()) {
+ for (OrderDetail orderDetail : orderDetaillist) {
+ //鐢熸垚鐢熶骇璁㈠崟鍙�
+
+ for (int i = 0; i < count; i++) {
+ letters = lettr++;
+ productIdVl = orderID + letters;
+ //鏌ヨ鐢熸垚鐨勭敓浜ц鍗曞彿鏄惁瀛樺湪
+
+ Integer workCount = workOrderMapper.selectOrderNumber(productIdVl);
+ if (workCount < 1 ) {
+ break;
+ }
+
+ }
+
+ //娣诲姞鐢熶骇璁㈠崟
+ workOrderMapper.addOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(), userName);
+ Integer State = 2;
+ Integer States = 1;
+ //鏌ヨ璇ヨ鍗曟湭杞敓浜ц鍗曠殑鏉℃暟
+ Integer NoWorkCount = workOrderMapper.selectWorkCount(orderDetail.getOrderId());
+ if (NoWorkCount == 0) {
+ //鏉℃暟涓�0淇敼杞敓浜ц鍗曠姸鎬佷负2锛屽惁鍒欎负1
+ workOrderMapper.updateWorkType(orderDetail.getOrderId(), State);
+ } else {
+ workOrderMapper.updateWorkType(orderDetail.getOrderId(), States);
+ }
+ }
+
+ return true;
+ } else {
+ return false;
+ }
+
+ }
+
+ public Boolean deleteOrderWorkSv(String orderId, String productName) {
+ if (!orderId.isEmpty() && !productName.isEmpty()) {
+ workOrderMapper.deleteOrderWorkMp(orderId, productName);
+ Integer State = 0;
+ Integer States = 1;
+ Integer NoWorkCount = workOrderMapper.selectWorkCount(orderId);
+ Integer YesWorkCount = workOrderMapper.selectYesWorkCount(orderId);
+ if (NoWorkCount ==YesWorkCount) {
+ workOrderMapper.updateWorkType(orderId, State);
+ } else {
+ workOrderMapper.updateWorkType(orderId, States);
+ }
+ return true;
+ } else {
+ return false;
+ }
+ }
}
--
Gitblit v1.8.0