From 736dd5afb982ce1c19b15633ffd3495f6f8822ec Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期二, 20 二月 2024 16:19:38 +0800
Subject: [PATCH] 工单管理转生产订单、删除，流程卡管理部分查询相关代码
---
north-glass-erp/src/main/java/com/example/erp/service/pp/WorkOrderService.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 66 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..a75796b 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,69 @@
@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;
+ }
+
+ }
+ System.out.println(productIdVl);
+ workOrderMapper.AddOrderWorkMp(productIdVl, orderDetail.getOrderId(), orderDetail.getProductId(), orderDetail.getProductName(),userName);
+ }
+ return true;
+ } else {
+ return false;
+ }
+
+ }
+
+ public Boolean DeleteOrderWorkSv(String orderId, String productName) {
+ if (!orderId.isEmpty()&&!productName.isEmpty()){
+ workOrderMapper.DeleteOrderWorkMp(orderId, productName);
+ return true;
+ }
+ else {
+ return false;
+ }
+ }
}
--
Gitblit v1.8.0