From 56f89b4a45a561ff017ffd1e611e542130d046a0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 15 八月 2023 09:15:19 +0800
Subject: [PATCH] 合并
---
inventory-server/src/main/resources/mapper/SaleMaterialMapper.xml | 0
inventory-server/src/main/java/com/yuanchu/mom/service/SaleMaterialService.java | 0
inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml | 51 +++-
inspect-server/src/main/resources/mapper/RawInspectMapper.xml | 24 ++
inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java | 11
inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java | 5
inspect-server/src/main/java/com/yuanchu/mom/service/ResportService.java | 28 ++
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java | 0
inventory-server/pom.xml | 6
inspect-server/src/main/java/com/yuanchu/mom/pojo/ProReport.java | 28 ++
inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java | 2
inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java | 3
pom.xml | 1
inspect-server/src/test/java/com/yuanchu/mom/InspectServerApplicationTests.java | 5
inventory-server/src/main/java/com/yuanchu/mom/service/OrdersService.java | 3
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleMaterialServiceImpl.java | 0
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java | 0
inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java | 7
inventory-server/src/main/resources/mapper/RepertoryMapper.xml | 8
inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java | 7
inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java | 2
inspect-server/src/main/java/com/yuanchu/mom/controller/ResportController.java | 51 +++++
inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java | 11 -
inventory-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java | 0
inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java | 15 +
inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java | 7
inventory-server/src/main/java/com/yuanchu/mom/controller/ReceiptController.java | 2
inventory-server/src/main/java/com/yuanchu/mom/pojo/vo/SaleVo.java | 4
/dev/null | 37 ---
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java | 0
inspect-server/src/main/java/com/yuanchu/mom/pojo/StatisticsData.java | 17 +
inventory-server/src/main/java/com/yuanchu/mom/controller/SaleMaterialController.java | 0
inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java | 11
inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java | 6
inventory-server/src/main/resources/mapper/SaleMapper.xml | 58 +++++
standard-server/pom.xml | 1
inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java | 4
inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMaterialMapper.java | 0
inspect-server/src/main/java/com/yuanchu/mom/service/impl/ResportServiceImpl.java | 144 ++++++++++++++
inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java | 0
system-run/pom.xml | 10 -
42 files changed, 469 insertions(+), 102 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
index 70b202e..efbfcdb 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/RawInspectController.java
@@ -40,7 +40,7 @@
@ApiImplicitParam(name = "formTime", value = "鏉ユ枡鏃ユ湡", dataTypeClass = String.class),
@ApiImplicitParam(name = "createTime", value = "鎶ユ鏃ユ湡", dataTypeClass = String.class),
@ApiImplicitParam(name = "insState", value = "妫�娴嬬姸鎬�: 鍏ㄩ儴榛樿2", dataTypeClass = Integer.class, required = true),
- @ApiImplicitParam(name = "judgeState", value = "鍚堟牸鐘舵��: 鍏ㄩ儴榛樿2", dataTypeClass = Integer.class, required = true),
+ @ApiImplicitParam(name = "judgeState", value = "鍚堟牸鐘舵��: 鍏ㄩ儴榛樿2", dataTypeClass = Integer.class, required = true)
})
@PostMapping("/selectRawInspectsList")
public Result selectRawInspectsList(Integer pageSize, Integer countSize, String formTime, String createTime, Integer insState, Integer judgeState) {
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/ResportController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/ResportController.java
new file mode 100644
index 0000000..6673339
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/ResportController.java
@@ -0,0 +1,51 @@
+package com.yuanchu.mom.controller;
+
+
+import com.yuanchu.mom.pojo.StatisticsData;
+import com.yuanchu.mom.service.ResportService;
+import com.yuanchu.mom.vo.Result;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+
+
+@RestController
+@RequestMapping("/resport")
+@Api(tags = "QMS绠＄悊-->璐ㄩ噺缁熻")
+public class ResportController {
+
+ @Resource
+ ResportService resportService;
+
+
+ @ApiOperation("璁＄畻鍚堟牸涓庝笉鍚堟牸鏁伴噺鎺ュ彛")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "begin", value = "缁熻寮�濮嬫棩鏈�", dataTypeClass = String.class, required = true),
+ @ApiImplicitParam(name = "end", value = "缁熻缁撴潫鏃ユ湡", dataTypeClass = String.class, required = true)
+ })
+ @GetMapping("/qualifiedStatistics")
+ public Result turno(String begin, String end) {
+ StatisticsData statisticsData=resportService.turno(begin,end);
+ return Result.success(statisticsData);
+ }
+
+ @ApiOperation("璁＄畻浜у搧鏁伴噺鎺ュ彛")
+ @GetMapping("/allNum")
+ public Result allNum() {
+ return Result.success(resportService.allNum());
+ }
+
+ @ApiOperation("璁＄畻浜у搧杈炬爣鏁伴噺鎺ュ彛")
+ @GetMapping("/statisNum")
+ public Result statisNum() {
+ return Result.success(resportService.statisNum());
+ }
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java
index e01edee..1b970f7 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java
@@ -5,6 +5,7 @@
import com.yuanchu.mom.pojo.FinishedInspect;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.time.LocalDate;
import java.util.Map;
/**
@@ -18,4 +19,10 @@
public interface FinishedInspectMapper extends BaseMapper<FinishedInspect> {
IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer inspectResult, String inspectDate, String inspectUsername);
+
+ //璁＄畻鎴愬搧鎴栬�呰繃绋嬫楠屽湪鏌愪竴涓椂闂存鐨勫悎鏍兼暟
+ Integer selCountFin(String begin, String end, int type,int result);
+
+ //璁＄畻鏈堜骇閲�
+ Long seAllCount(String begin, String end, int type);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
index fecdc43..b9a04f5 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/RawInspectMapper.java
@@ -3,6 +3,7 @@
import com.yuanchu.mom.pojo.RawInspect;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import java.time.LocalDate;
import java.util.List;
/**
@@ -16,6 +17,11 @@
List<RawInspect> selectRawInspectsByLimit(int pageSize, int countSize, String formTime, String createTime,int insState,int judgeState);
+ //璁＄畻鍘熸潗鏂欏湪鏌愪釜鑼冨洿鍐呯殑鍚堟牸鎴栦笉鍚堟牸鏁伴噺
+ Integer selCountRaw(String begin, String end,Integer judgeState);
+
+ //璁＄畻鏈堟�讳骇閲�
+ Long seAllCount(String begin, String end);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/ProReport.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/ProReport.java
new file mode 100644
index 0000000..13c0d9c
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/ProReport.java
@@ -0,0 +1,28 @@
+package com.yuanchu.mom.pojo;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ProReport implements Serializable {
+
+ //鏃ユ湡锛屼互閫楀彿鍒嗛殧锛屼緥濡傦細2022-10-01,2022-10-02,2022-10-03
+ private String dateList;
+
+ //鎴愬搧鎬婚噺锛屼互閫楀彿鍒嗛殧锛屼緥濡傦細200,210,220
+ private String finishedList;
+
+ //杩囩▼鎬婚噺锛屼互閫楀彿鍒嗛殧锛屼緥濡傦細20,21,10
+ private String processList;
+
+ //鍘熸潗鏂欐�婚噺锛屼互閫楀彿鍒嗛殧锛屼緥濡傦細20,21,10
+ private String materialList;
+
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/StatisticsData.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StatisticsData.java
new file mode 100644
index 0000000..39fd6f4
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/StatisticsData.java
@@ -0,0 +1,17 @@
+package com.yuanchu.mom.pojo;
+
+
+import lombok.Data;
+
+@Data
+public class StatisticsData {
+ private int material; //鍘熸潗鏂欏悎鏍�
+ private int process; //杩囩▼鍚堟牸
+ private int finished; //鎴愬搧鍚堟牸
+ private int unmaterial; //鍘熸潗鏂欎笉鍚堟牸
+ private int unprocess; //杩囩▼涓嶅悎鏍�
+ private int unfinished; //鎴愬搧涓嶅悎鏍�
+
+
+
+}
\ No newline at end of file
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/ResportService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/ResportService.java
new file mode 100644
index 0000000..9e9ef87
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/ResportService.java
@@ -0,0 +1,28 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.StatisticsData;
+import com.yuanchu.mom.pojo.ProReport;
+
+public interface ResportService {
+
+ /**
+ * 璁＄畻鍚堟牸涓庝笉鍚堟牸鏁伴噺
+ * @param begin
+ * @param end
+ * @return
+ */
+ StatisticsData turno(String begin, String end);
+
+ /**
+ * 璁＄畻浜у搧鎬婚噺
+ * @return
+ */
+ ProReport allNum();
+
+ /**
+ * 璁＄畻杈炬爣鎬婚噺
+ * @return
+ */
+ ProReport statisNum();
+
+}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ResportServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ResportServiceImpl.java
new file mode 100644
index 0000000..dae4d0c
--- /dev/null
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/ResportServiceImpl.java
@@ -0,0 +1,144 @@
+package com.yuanchu.mom.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.yuanchu.mom.mapper.FinishedInspectMapper;
+import com.yuanchu.mom.mapper.RawInspectMapper;
+import com.yuanchu.mom.pojo.ProReport;
+import com.yuanchu.mom.pojo.RawInspect;
+import com.yuanchu.mom.pojo.StatisticsData;
+import com.yuanchu.mom.service.ResportService;
+import lombok.Data;
+import org.apache.tomcat.util.buf.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
+import java.util.ArrayList;
+import java.util.Date;
+
+
+@Service
+public class ResportServiceImpl implements ResportService {
+
+ @Resource
+ RawInspectMapper rawInspectMapper;
+
+ @Resource
+ FinishedInspectMapper finishedInspectMapper;
+
+ //璁＄畻鍚堟牸涓庝笉鍚堟牸鏁伴噺
+ @Override
+ public StatisticsData turno(String begin, String end) {
+ StatisticsData statisticsData = new StatisticsData();
+ //鍘熸潗鏂欏悎鏍�
+ Integer material = rawInspectMapper.selCountRaw(begin, end, 1);
+ statisticsData.setMaterial(material);
+ //鍘熸潗鏂欎笉鍚堟牸
+ Integer unmaterial = rawInspectMapper.selCountRaw(begin, end, 0);
+ statisticsData.setUnmaterial(unmaterial);
+ //杩囩▼鍚堟牸鏁�
+ Integer process = finishedInspectMapper.selCountFin(begin, end, 1, 1);
+ statisticsData.setProcess(process);
+ //杩囩▼涓嶅悎鏍�
+ Integer unprocess = finishedInspectMapper.selCountFin(begin, end, 1, 0);
+ statisticsData.setUnprocess(unprocess);
+ //鎴愬搧鍚堟牸鏁�
+ Integer finished = finishedInspectMapper.selCountFin(begin, end, 0, 1);
+ statisticsData.setFinished(finished);
+ //鎴愬搧涓嶅悎鏍�
+ Integer unfinished = finishedInspectMapper.selCountFin(begin, end, 0, 0);
+ statisticsData.setUnfinished(unfinished);
+ return statisticsData;
+ }
+
+ //璁＄畻浜у搧鎬婚噺
+ @Override
+ public ProReport allNum() {
+ // 鑾峰彇褰撳墠鏃ユ湡鐨勫墠涓や釜鏈堢殑鏃ユ湡
+ ArrayList<String> dateList = new ArrayList<>();
+ LocalDate now = LocalDate.now();
+ LocalDate oneAgo = now.minusMonths(1);
+ LocalDate twoAgo = now.minusMonths(2);
+ // 鏍煎紡鍖栨棩鏈熷璞�
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+ dateList.add(twoAgo.format(formatter));
+ dateList.add(oneAgo.format(formatter));
+ dateList.add(now.format(formatter));
+ //鑾峰彇鍘熸潗鏂欐湀浜ч噺
+ Long cLong = rawInspectMapper.seAllCount(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString());
+ Long bLong = rawInspectMapper.seAllCount(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString());
+ Long aLong = rawInspectMapper.seAllCount(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString());
+ ArrayList<String> materialList = new ArrayList<>();
+ materialList.add(aLong.toString());
+ materialList.add(bLong.toString());
+ materialList.add(cLong.toString());
+ //鑾峰彇杩囩▼鏈堜骇閲�
+ Long c1Long = finishedInspectMapper.seAllCount(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
+ Long b1Long = finishedInspectMapper.seAllCount(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
+ Long a1Long = finishedInspectMapper.seAllCount(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
+ ArrayList<String> processList = new ArrayList<>();
+ processList.add(a1Long.toString());
+ processList.add(b1Long.toString());
+ processList.add(c1Long.toString());
+ //鑾峰彇鎴愬搧鏈堜骇閲�
+ Long c2Long = finishedInspectMapper.seAllCount(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0);
+ Long b2Long = finishedInspectMapper.seAllCount(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0);
+ Long a2Long = finishedInspectMapper.seAllCount(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0);
+ ArrayList<String> finishedList = new ArrayList<>();
+ finishedList.add(a2Long.toString());
+ finishedList.add(b2Long.toString());
+ finishedList.add(c2Long.toString());
+ return ProReport.builder()
+ .dateList(StringUtils.join(dateList, ','))
+ .materialList(StringUtils.join(materialList, ','))
+ .processList(StringUtils.join(processList, ','))
+ .finishedList(StringUtils.join(finishedList, ','))
+ .build();
+ }
+
+ //璁＄畻杈炬爣鎬婚噺
+ @Override
+ public ProReport statisNum() {
+ // 鑾峰彇褰撳墠鏃ユ湡鐨勫墠涓や釜鏈堢殑鏃ユ湡
+ ArrayList<String> dateList = new ArrayList<>();
+ LocalDate now = LocalDate.now();
+ LocalDate oneAgo = now.minusMonths(1);
+ LocalDate twoAgo = now.minusMonths(2);
+ // 鏍煎紡鍖栨棩鏈熷璞�
+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM");
+ dateList.add(twoAgo.format(formatter));
+ dateList.add(oneAgo.format(formatter));
+ dateList.add(now.format(formatter));
+ //鑾峰彇鍘熸潗鏂欐湀杈炬爣浜ч噺
+ Integer c = rawInspectMapper.selCountRaw(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
+ Integer b = rawInspectMapper.selCountRaw(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
+ Integer a = rawInspectMapper.selCountRaw(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1);
+ ArrayList<String> materialList = new ArrayList<>();
+ materialList.add(a.toString());
+ materialList.add(b.toString());
+ materialList.add(c.toString());
+ //鑾峰彇杩囩▼鏈堣揪鏍囦骇閲�
+ Integer c1 = finishedInspectMapper.selCountFin(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1, 1);
+ Integer b1 = finishedInspectMapper.selCountFin(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1, 1);
+ Integer a1 = finishedInspectMapper.selCountFin(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 1, 1);
+ ArrayList<String> processList = new ArrayList<>();
+ processList.add(a1.toString());
+ processList.add(b1.toString());
+ processList.add(c1.toString());
+ //鑾峰彇鎴愬搧鏈堣揪鏍囦骇閲�
+ Integer c2 = finishedInspectMapper.selCountFin(now.withDayOfMonth(1).toString(), now.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0, 1);
+ Integer b2 = finishedInspectMapper.selCountFin(oneAgo.withDayOfMonth(1).toString(), oneAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0, 1);
+ Integer a2 = finishedInspectMapper.selCountFin(twoAgo.withDayOfMonth(1).toString(), twoAgo.plusMonths(1).withDayOfMonth(1).minusDays(1).toString(), 0, 1);
+ ArrayList<String> finishedList = new ArrayList<>();
+ finishedList.add(a2.toString());
+ finishedList.add(b2.toString());
+ finishedList.add(c2.toString());
+ return ProReport.builder()
+ .dateList(StringUtils.join(dateList, ','))
+ .materialList(StringUtils.join(materialList, ','))
+ .processList(StringUtils.join(processList, ','))
+ .finishedList(StringUtils.join(finishedList, ','))
+ .build();
+ }
+}
diff --git a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
index 40924a7..bd34643 100644
--- a/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/FinishedInspectMapper.xml
@@ -1,21 +1,46 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.yuanchu.mom.mapper.FinishedInspectMapper">
-
<select id="selectFinishedInspectPage" resultType="map">
- SELECT f.`id`, f.`order_number`, f.`customer_name`, f.`project_name`, f.`quality_traceability`, f.`material_code`, f.`material`, f.`specifications_model`, f.`unit`,
- f.`quantity`, u.`name`, DATE_FORMAT(f.`create_time`, '%Y-%m-%d') detectionPeriod, f.`result`
+ SELECT f.`id`, f.`order_number`, f.`customer_name`, f.`project_name`, f.`quality_traceability`,
+ f.`material_code`, f.`material`, f.`specifications_model`, f.`unit`,
+ f.`quantity`, u.`name`, DATE_FORMAT(f.`create_time`, '%Y-%m-%d') detectionPeriod, f.`result`
FROM finished_inspect f, `user` u
WHERE f.`user_id` = u.`id`
- AND f.`state` = 1
- <if test="inspectResult != null and inspectResult != ''">
- AND f.result = #{inspectResult}
- </if>
- <if test="inspectDate != null and inspectDate != ''">
- AND DATE_FORMAT(f.`create_time`, '%Y-%m-%d') = #{inspectDate}
- </if>
- <if test="inspectUsername != null and inspectUsername != ''">
- AND u.`name` LIKE CONCAT('%',#{inspectUsername},'%')
- </if>
+ AND f.`state` = 1
+ <if test="inspectResult != null and inspectResult != ''">
+ AND f.result = #{inspectResult}
+ </if>
+ <if test="inspectDate != null and inspectDate != ''">
+ AND DATE_FORMAT(f.`create_time`, '%Y-%m-%d') = #{inspectDate}
+ </if>
+ <if test="inspectUsername != null and inspectUsername != ''">
+ AND u.`name` LIKE CONCAT('%',#{inspectUsername},'%')
+ </if>
+ </select>
+ <select id="selCountFin" resultType="java.lang.Integer">
+ select count(id)
+ from mom_ocean.finished_inspect
+ where state=1
+ and result=#{result}
+ and type=#{type}
+ <if test="begin != null and begin!=''">
+ and finished_inspect.create_time >= #{begin}
+ </if>
+ <if test="end != null and end!=''">
+ and finished_inspect.create_time <= #{end}
+ </if>
+ </select>
+ <select id="seAllCount" resultType="java.lang.Long">
+ select count(id)
+ from mom_ocean.finished_inspect
+ where state=1
+ and type=#{type}
+ <if test="begin != null and begin!=''">
+ and finished_inspect.create_time >= #{begin}
+ </if>
+ <if test="end != null and end!=''">
+ and finished_inspect.create_time <= #{end}
+ </if>
</select>
</mapper>
diff --git a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
index e2d212b..a5b294b 100644
--- a/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
+++ b/inspect-server/src/main/resources/mapper/RawInspectMapper.xml
@@ -39,4 +39,28 @@
order by id desc
limit #{pageSize},#{countSize}
</select>
+ <select id="selCountRaw" resultType="java.lang.Integer">
+ select count(id)
+ from mom_ocean.raw_inspect
+ where state=1
+ and ins_state=1
+ and judge_state=#{judgeState}
+ <if test="begin != null and begin!=''">
+ and raw_inspect.create_time >= #{begin}
+ </if>
+ <if test="end != null and end!=''">
+ and raw_inspect.create_time <= #{end}
+ </if>
+ </select>
+ <select id="seAllCount" resultType="java.lang.Long">
+ select count(id)
+ from mom_ocean.raw_inspect
+ where state=1
+ <if test="begin != null and begin!=''">
+ and raw_inspect.create_time >= #{begin}
+ </if>
+ <if test="end != null and end!=''">
+ and raw_inspect.create_time <= #{end}
+ </if>
+ </select>
</mapper>
diff --git a/inspect-server/src/test/java/com/yuanchu/mom/InspectServerApplicationTests.java b/inspect-server/src/test/java/com/yuanchu/mom/InspectServerApplicationTests.java
index 03d7150..ad11e08 100644
--- a/inspect-server/src/test/java/com/yuanchu/mom/InspectServerApplicationTests.java
+++ b/inspect-server/src/test/java/com/yuanchu/mom/InspectServerApplicationTests.java
@@ -1,7 +1,10 @@
package com.yuanchu.mom;
+
import org.junit.jupiter.api.Test;
import org.springframework.boot.test.context.SpringBootTest;
+
+
@SpringBootTest
class InspectServerApplicationTests {
@@ -9,5 +12,5 @@
@Test
void contextLoads() {
}
-
}
+
diff --git a/inventory-server/pom.xml b/inventory-server/pom.xml
index 8f13703..baf1f1d 100644
--- a/inventory-server/pom.xml
+++ b/inventory-server/pom.xml
@@ -31,12 +31,6 @@
<version>0.0.1-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>com.yuanchu.mom</groupId>
- <artifactId>sale-server</artifactId>
- <version>1.0.0</version>
- </dependency>
-
<!--宸ュ叿妯″潡-->
<dependency>
<groupId>com.yuanchu.mom</groupId>
diff --git a/standard-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
similarity index 80%
rename from standard-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
rename to inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
index ab00530..6a77b84 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/OrdersController.java
@@ -38,7 +38,7 @@
@ApiImplicitParam(name = "countSize", value = "鏉℃暟/椤�", dataTypeClass = Integer.class, required = true),
@ApiImplicitParam(name = "orderCode", value = "璁㈠崟缂栧彿", dataTypeClass = String.class),
@ApiImplicitParam(name = "name", value = "浜у搧鍚嶇О", dataTypeClass = String.class),
- @ApiImplicitParam(name = "state", value = "鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
+ @ApiImplicitParam(name = "state", value = "缂栧埗鐘舵��(涓虹┖=鍏ㄩ儴)", dataTypeClass = Integer.class),
@ApiImplicitParam(name = "time", value = "涓嬪崟鏃堕棿", dataTypeClass = String.class)
})
@GetMapping("/selectAllOrder")
@@ -48,15 +48,6 @@
map.put("total", inspectionPage.getTotal());
map.put("row", inspectionPage.getRecords());
return Result.success(map);
- }
-
- @ApiOperation("鏍规嵁璁㈠崟id鏌ヨ璁㈠崟璇︽儏")
- @ApiImplicitParams(value = {
- @ApiImplicitParam(name = "id", value = "璁㈠崟id", dataTypeClass = Integer.class, required = true)
- })
- @GetMapping("/selectOrderById")
- public Result selectOrderById(Integer id) {
- return Result.success(ordersService.getById(id));
}
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/controller/ReceiptController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/ReceiptController.java
index e442845..64651c2 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/controller/ReceiptController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/ReceiptController.java
@@ -89,7 +89,7 @@
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "id", value = "鍥炲崟id", dataTypeClass = Integer.class, required = true)
})
- @PostMapping("/selReceDatil")
+ @GetMapping("/selReceDatil")
public ResponseEntity<byte[]> selReceDatil(Integer id) throws IOException {
return receiptService.selReceDatil(id);
}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
similarity index 93%
rename from sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
rename to inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
index 97fa896..0505b8c 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleController.java
@@ -3,10 +3,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.pojo.dto.vo.SaleVo;
+import com.yuanchu.mom.pojo.vo.SaleVo;
+import com.yuanchu.mom.service.RepertoryService;
import com.yuanchu.mom.utils.JackSonUtil;
-import org.json.JSONException;
-import org.json.JSONObject;
import com.yuanchu.mom.pojo.dto.SaleDto;
import com.yuanchu.mom.service.SaleService;
import com.yuanchu.mom.utils.Jwt;
@@ -18,7 +17,6 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
-import java.lang.reflect.Array;
import java.util.*;
/**
@@ -40,6 +38,9 @@
@Resource
Jwt jwt;
+ @Resource
+ RepertoryService repertoryService;
+
@ApiOperation(value = "鏌ヨ閿�鍞崟鍒楄〃")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize", value = "椤垫暟", dataTypeClass = Integer.class, required = true),
@@ -58,6 +59,12 @@
return Result.success(map);
}
+ @ApiOperation(value = "鏂板閿�鍞崟-->娣诲姞浜у搧-->鏌ヨ鎴愬搧搴撳瓨")
+ @PostMapping("/seleRepe")
+ public Result seleRepe() {
+ return Result.success(repertoryService.getSale());
+ }
+
@ApiOperation(value = "鏂板閿�鍞崟")
@PostMapping("/addSale")
public Result addSale(@RequestHeader("token") String token, @RequestBody SaleDto saleDto) throws Exception {
diff --git a/sale-server/src/main/java/com/yuanchu/mom/controller/SaleMaterialController.java b/inventory-server/src/main/java/com/yuanchu/mom/controller/SaleMaterialController.java
similarity index 100%
rename from sale-server/src/main/java/com/yuanchu/mom/controller/SaleMaterialController.java
rename to inventory-server/src/main/java/com/yuanchu/mom/controller/SaleMaterialController.java
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java b/inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java
index 958b9ca..c1c2bda 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/mapper/RepertoryMapper.java
@@ -6,6 +6,7 @@
import com.yuanchu.mom.pojo.Repertory;
import org.apache.ibatis.annotations.Param;
+import java.util.List;
import java.util.Map;
/**
@@ -18,5 +19,9 @@
//鏌ヨ鎵�鏈夊簱瀛樺垪琛�
IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer checkState);
+
+ //鏌ヨ搴撳瓨涓変釜瀛楁缁欐坊鍔犻攢鍞崟
+ List<Map<String, Object>> getSale();
+
}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java b/inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
similarity index 79%
rename from sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
rename to inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
index 8193cc4..581f85d 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMapper.java
@@ -20,6 +20,6 @@
//鏌ヨ閿�鍞崟鍒楄〃
IPage<Map<String, Object>> selectSaleList(Page<Object> page, String orderNumber, String name, Integer type, String delTime);
-
-
+ //鏌ヨ璁㈠崟bom鍒楄〃
+ IPage<Map<String, Object>> selectAllOrder(Page<Object> page, String orderCode, String name, Integer state, String time);
}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMaterialMapper.java b/inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMaterialMapper.java
similarity index 100%
rename from sale-server/src/main/java/com/yuanchu/mom/mapper/SaleMaterialMapper.java
rename to inventory-server/src/main/java/com/yuanchu/mom/mapper/SaleMaterialMapper.java
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
similarity index 94%
rename from sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
rename to inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
index 5e03988..39192dd 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/Sale.java
@@ -90,5 +90,8 @@
@ApiModelProperty(value = "鐘舵�� 0:涓嶉�氳繃;1:閫氳繃")
private Integer type;
+ @ApiModelProperty(value = "缂栧埗鐘舵��0:寰呯紪鍒�;1宸茬紪鍒� 閫氳繃灏辨槸宸茬紪鍒�,娌℃湁鐘舵�佸氨鏄緟缂栧埗")
+ private Integer bianzhiState;
+
}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java
similarity index 100%
rename from sale-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java
rename to inventory-server/src/main/java/com/yuanchu/mom/pojo/SaleMaterial.java
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
similarity index 100%
rename from sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
rename to inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto1.java
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java
similarity index 100%
rename from sale-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java
rename to inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/ConsignmentDto2.java
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
similarity index 100%
rename from sale-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
rename to inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleDto.java
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java
similarity index 100%
rename from sale-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java
rename to inventory-server/src/main/java/com/yuanchu/mom/pojo/dto/SaleMaterialDto.java
diff --git a/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/vo/SaleVo.java b/inventory-server/src/main/java/com/yuanchu/mom/pojo/vo/SaleVo.java
similarity index 93%
rename from sale-server/src/main/java/com/yuanchu/mom/pojo/dto/vo/SaleVo.java
rename to inventory-server/src/main/java/com/yuanchu/mom/pojo/vo/SaleVo.java
index e0a8285..8290067 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/pojo/dto/vo/SaleVo.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/pojo/vo/SaleVo.java
@@ -1,4 +1,4 @@
-package com.yuanchu.mom.pojo.dto.vo;
+package com.yuanchu.mom.pojo.vo;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -27,4 +27,4 @@
//瀹℃牳鏃ユ湡
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
private Date checkTime;
-}
+}
\ No newline at end of file
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/OrdersService.java b/inventory-server/src/main/java/com/yuanchu/mom/service/OrdersService.java
similarity index 85%
rename from standard-server/src/main/java/com/yuanchu/mom/service/OrdersService.java
rename to inventory-server/src/main/java/com/yuanchu/mom/service/OrdersService.java
index ec2d14a..5d045dc 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/OrdersService.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/OrdersService.java
@@ -3,7 +3,6 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
-import com.yuanchu.mom.pojo.Orders;
import java.util.Map;
@@ -13,7 +12,7 @@
* @author zss
* @since 2023-07-31 11:57:44
*/
-public interface OrdersService extends IService<Orders> {
+public interface OrdersService {
/**
* 鏌ヨ鎵�鏈夎鍗曞垪琛�
*
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java b/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java
index 03a42dc..27090d6 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/RepertoryService.java
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.Repertory;
+import java.util.List;
import java.util.Map;
/**
@@ -25,5 +26,11 @@
* @return
*/
IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer checkState);
+
+ /**
+ * 鏌ヨ搴撳瓨涓変釜瀛楁缁欐坊鍔犻攢鍞崟
+ * @return
+ */
+ List<Map<String,Object>> getSale();
}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/service/SaleMaterialService.java b/inventory-server/src/main/java/com/yuanchu/mom/service/SaleMaterialService.java
similarity index 100%
rename from sale-server/src/main/java/com/yuanchu/mom/service/SaleMaterialService.java
rename to inventory-server/src/main/java/com/yuanchu/mom/service/SaleMaterialService.java
diff --git a/sale-server/src/main/java/com/yuanchu/mom/service/SaleService.java b/inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java
similarity index 97%
rename from sale-server/src/main/java/com/yuanchu/mom/service/SaleService.java
rename to inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java
index 940eeda..7dcd818 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/service/SaleService.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/SaleService.java
@@ -6,7 +6,7 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.pojo.dto.ConsignmentDto1;
import com.yuanchu.mom.pojo.dto.SaleDto;
-import com.yuanchu.mom.pojo.dto.vo.SaleVo;
+import com.yuanchu.mom.pojo.vo.SaleVo;
import java.util.List;
import java.util.Map;
diff --git a/standard-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
similarity index 64%
rename from standard-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
rename to inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
index 15b81de..163b889 100644
--- a/standard-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/OrdersServiceImpl.java
@@ -1,16 +1,13 @@
package com.yuanchu.mom.service.impl;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.yuanchu.mom.mapper.OrdersMapper;
-import com.yuanchu.mom.pojo.Orders;
+import com.yuanchu.mom.mapper.SaleMapper;
import com.yuanchu.mom.service.OrdersService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
-import java.util.HashMap;
import java.util.Map;
/**
@@ -20,15 +17,15 @@
* @since 2023-07-31 11:57:44
*/
@Service("orderService")
-public class OrdersServiceImpl extends ServiceImpl<OrdersMapper, Orders> implements OrdersService {
+public class OrdersServiceImpl implements OrdersService {
@Resource
- OrdersMapper orderMapper;
+ SaleMapper saleMapper;
//鏌ヨ鎵�鏈夎鍗曞垪琛�
@Override
public IPage<Map<String, Object>> selectAllOrder(Page<Object> page, String orderCode, String name, Integer state , String time) {
- return orderMapper.selectAllOrder(page, orderCode,name,state, time);
+ return saleMapper.selectAllOrder(page, orderCode,name,state, time);
}
}
diff --git a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java
index 16fa0c9..c54e9ef 100644
--- a/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/RepertoryServiceImpl.java
@@ -9,6 +9,7 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.List;
import java.util.Map;
/**
@@ -28,5 +29,11 @@
public IPage<Map<String, Object>> selectAllRepertory(Page<Object> page, String name, String specifications, String time, Integer type,Integer checkState) {
return repertoryMapper.selectAllRepertory(page,name,specifications,time,type,checkState);
}
+
+ //鏌ヨ搴撳瓨涓変釜瀛楁缁欐坊鍔犻攢鍞崟
+ @Override
+ public List<Map<String, Object>> getSale() {
+ return repertoryMapper.getSale();
+ }
}
diff --git a/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleMaterialServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleMaterialServiceImpl.java
similarity index 100%
rename from sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleMaterialServiceImpl.java
rename to inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleMaterialServiceImpl.java
diff --git a/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
similarity index 95%
rename from sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
rename to inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
index f661cff..bffc773 100644
--- a/sale-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
+++ b/inventory-server/src/main/java/com/yuanchu/mom/service/impl/SaleServiceImpl.java
@@ -11,7 +11,7 @@
import com.yuanchu.mom.pojo.dto.ConsignmentDto2;
import com.yuanchu.mom.pojo.dto.SaleDto;
import com.yuanchu.mom.pojo.dto.SaleMaterialDto;
-import com.yuanchu.mom.pojo.dto.vo.SaleVo;
+import com.yuanchu.mom.pojo.vo.SaleVo;
import com.yuanchu.mom.service.SaleService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.beans.BeanUtils;
@@ -53,7 +53,7 @@
BeanUtils.copyProperties(saleDto,sale);
sale.setSaleman(saleman);
saleMapper.insert(sale);
- //濡傛灉saleMaterialList鏈夊��,闇�瑕佹坊鍔犻攢鍞骇鍝佸崟
+ //娣诲姞閿�鍞骇鍝佸崟
List<SaleMaterialDto> saleMaterialDtoList = saleDto.getSaleMaterialList();
for (SaleMaterialDto saleMaterialDto : saleMaterialDtoList) {
SaleMaterial saleMaterial = new SaleMaterial();
@@ -134,6 +134,13 @@
sale.setType(type);
sale.setCheckname(checkname);
sale.setCheckTime(new Date());
+ if (type==1) {
+ //濡傛灉瀹℃牳閫氳繃
+ sale.setBianzhiState(1);
+ }else {
+ //濡傛灉瀹℃牳涓嶉�氳繃
+ sale.setBianzhiState(null);
+ }
saleMapper.updateById(sale);
}
diff --git a/inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml b/inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml
index 56f10b8..9e0d499 100644
--- a/inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml
+++ b/inventory-server/src/main/resources/mapper/ImportRepertoryMapper.xml
@@ -10,7 +10,7 @@
unit,
number,
user_name,
- create_time
+ DATE_FORMAT(create_time, '%Y-%m-%d')'鍏ュ簱鏃ユ湡'
from mom_ocean.import_repertory
where state=1
<if test="orderCode!=null and orderCode!=''">
diff --git a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
index 3172d85..11d1608 100644
--- a/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
+++ b/inventory-server/src/main/resources/mapper/RepertoryMapper.xml
@@ -14,7 +14,7 @@
<where>
and state=1
<if test="name!=null and name!=''">
- and name LIKE CONCAT('%',#{name},'%')
+ and name LIKE CONCAT('%',#{name},'%')
</if>
<if test="specifications!=null and specifications!=''">
and specifications LIKE CONCAT('%',#{specifications},'%')
@@ -31,4 +31,10 @@
order by id desc
</where>
</select>
+ <!--鏌ヨ搴撳瓨涓変釜瀛楁缁欐坊鍔犻攢鍞崟-->
+ <select id="getSale" resultType="java.util.Map">
+ select id, name, specifications, unit
+ from mom_ocean.repertory
+ where state = 1
+ </select>
</mapper>
\ No newline at end of file
diff --git a/inventory-server/src/main/resources/mapper/SaleMapper.xml b/inventory-server/src/main/resources/mapper/SaleMapper.xml
new file mode 100644
index 0000000..ef865df
--- /dev/null
+++ b/inventory-server/src/main/resources/mapper/SaleMapper.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yuanchu.mom.mapper.SaleMapper">
+ <select id="selectSaleList" resultType="java.util.Map">
+ select id,
+ order_number,
+ code,
+ name,
+ proname,
+ type,
+ DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡'
+ from mom_ocean.sale
+ where state=1
+ <if test="orderNumber!=null and orderNumber!=''">
+ and order_number like concat('%',#{orderNumber},'%')
+ </if>
+ <if test="name!=null and name!=''">
+ and name LIKE CONCAT('%',#{name},'%')
+ </if>
+ <if test="type!=null and type!=''">
+ and type=#{type}
+ </if>
+ <if test="delTime!=null and delTime!=''">
+ and DATE_FORMAT(delTime, '%Y-%m-%d')=#{delTime}
+ </if>
+ order by id desc
+ </select>
+
+ <!--鏌ヨ璁㈠崟BOM鍒楄〃-->
+ <select id="selectAllOrder" resultType="java.util.Map">
+ select s.id ,
+ order_number,
+ saleman,
+ proname,
+ sm.name,
+ specifications,
+ unit,
+ number,
+ DATE_FORMAT(s.create_time, '%Y-%m-%d') '涓嬪崟鏃ユ湡',
+ DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡',
+ bianzhi_state
+ from mom_ocean.sale s ,mom_ocean.sale_material sm
+ where s.id=sm.sale_id
+ and s.state=1
+ <if test="orderCode!=null and orderCode!=''">
+ and order_number like concat('%',#{orderCode},'%')
+ </if>
+ <if test="name!=null and name!=''">
+ and sm.name like concat('%',#{name},'%')
+ </if>
+ <if test="state!=null and state!=''">
+ and bianzhi_state=#{state}
+ </if>
+ <if test="time!=null and time!=''">
+ and s.create_time=#{time}
+ </if>
+ </select>
+</mapper>
diff --git a/sale-server/src/main/resources/mapper/SaleMaterialMapper.xml b/inventory-server/src/main/resources/mapper/SaleMaterialMapper.xml
similarity index 100%
rename from sale-server/src/main/resources/mapper/SaleMaterialMapper.xml
rename to inventory-server/src/main/resources/mapper/SaleMaterialMapper.xml
diff --git a/pom.xml b/pom.xml
index f3b8161..99772d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,6 @@
<module>inspect-server</module>
<module>inventory-server</module>
<module>system-run</module>
- <module>sale-server</module>
</modules>
<properties>
diff --git a/sale-server/pom.xml b/sale-server/pom.xml
deleted file mode 100644
index 3633f72..0000000
--- a/sale-server/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <parent>
- <artifactId>mom</artifactId>
- <groupId>com.yuanchu.mom</groupId>
- <version>1.0.0</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>sale-server</artifactId>
-
- <properties>
- <maven.compiler.source>8</maven.compiler.source>
- <maven.compiler.target>8</maven.compiler.target>
- </properties>
-
- <dependencies>
- <dependency>
- <groupId>com.yuanchu.mom</groupId>
- <artifactId>standard-server</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>com.yuanchu.mom</groupId>
- <artifactId>user-server</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <!--宸ュ叿妯″潡-->
- <dependency>
- <groupId>com.yuanchu.mom</groupId>
- <artifactId>framework</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.vaadin.external.google</groupId>
- <artifactId>android-json</artifactId>
- <version>0.0.20131108.vaadin1</version>
- <scope>compile</scope>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
diff --git a/sale-server/src/main/resources/mapper/SaleMapper.xml b/sale-server/src/main/resources/mapper/SaleMapper.xml
deleted file mode 100644
index f530a91..0000000
--- a/sale-server/src/main/resources/mapper/SaleMapper.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.yuanchu.mom.mapper.SaleMapper">
- <select id="selectSaleList" resultType="java.util.Map">
- select id,
- order_number,
- code,
- name,
- proname,
- type,
- DATE_FORMAT(delTime, '%Y-%m-%d') '浜よ揣鏃ユ湡'
- from mom_ocean.sale
- where state=1
- <if test="orderNumber!=null and orderNumber!=''">
- and order_number like concat('%',#{orderNumber},'%')
- </if>
- <if test="name!=null and name!=''">
- and name LIKE CONCAT('%',#{name},'%')
- </if>
- <if test="type!=null and type!=''">
- and type=#{type}
- </if>
- <if test="delTime!=null and delTime!=''">
- and DATE_FORMAT(delTime, '%Y-%m-%d')=#{delTime}
- </if>
- order by id desc
- </select>
-</mapper>
diff --git a/standard-server/pom.xml b/standard-server/pom.xml
index 5a94d01..85d7b0c 100644
--- a/standard-server/pom.xml
+++ b/standard-server/pom.xml
@@ -33,5 +33,6 @@
<artifactId>user-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
+
</dependencies>
</project>
diff --git a/standard-server/src/main/java/com/yuanchu/mom/mapper/OrdersMapper.java b/standard-server/src/main/java/com/yuanchu/mom/mapper/OrdersMapper.java
deleted file mode 100644
index 8116867..0000000
--- a/standard-server/src/main/java/com/yuanchu/mom/mapper/OrdersMapper.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.yuanchu.mom.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.yuanchu.mom.pojo.Orders;
-
-import java.util.List;
-import java.util.Map;
-
-
-/**
- * 璁㈠崟(Order)琛ㄦ暟鎹簱璁块棶灞�
- *
- * @author zss
- * @since 2023-07-31 11:57:44
- */
-public interface OrdersMapper extends BaseMapper<Orders> {
-
- //鏌ヨ鎵�鏈夎鍗曞垪琛�
- IPage<Map<String, Object>> selectAllOrder(Page<Object> page, String orderCode, String name, Integer state , String time);
-}
-
diff --git a/standard-server/src/main/java/com/yuanchu/mom/pojo/Orders.java b/standard-server/src/main/java/com/yuanchu/mom/pojo/Orders.java
deleted file mode 100644
index f9a767b..0000000
--- a/standard-server/src/main/java/com/yuanchu/mom/pojo/Orders.java
+++ /dev/null
@@ -1,136 +0,0 @@
-package com.yuanchu.mom.pojo;
-
-import com.baomidou.mybatisplus.annotation.*;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import lombok.experimental.Accessors;
-
-import java.util.Date;
-import java.io.Serializable;
-
-/**
- * 璁㈠崟(Order)琛ㄥ疄浣撶被
- *
- * @author zss
- * @since 2023-07-31 11:57:44
- */
-@Data
-@Accessors(chain = true)
-@AllArgsConstructor
-@NoArgsConstructor
-@EqualsAndHashCode(callSuper = false)
-@TableName("orders")
-public class Orders implements Serializable {
- private static final long serialVersionUID = 1L;
- /**
- * 璁㈠崟id
- */
- @ApiModelProperty(name = "璁㈠崟id")
- @TableId( type =IdType.AUTO)
- private Integer id;
-
- /**
- * 璁㈠崟缂栧彿
- */
- @ApiModelProperty(name = "璁㈠崟缂栧彿")
- @TableField("order_code")
- private String orderCode;
-
- /**
- * 瀹㈡埛鍚嶇О
- */
- @ApiModelProperty(name = "瀹㈡埛鍚嶇О")
- @TableField("proname")
- private String proname;
- /**
- * 浜у搧缂栫爜
- */
- @ApiModelProperty(name = "浜у搧缂栫爜")
- @TableField("code")
- private String code;
- /**
- * 浜у搧澶х被,0锛氬師鏉愭枡锛�1锛氭垚鍝侊紱2锛氬崐鎴愬搧
- */
- @ApiModelProperty(name = "浜у搧澶х被,0锛氬師鏉愭枡锛�1锛氭垚鍝侊紱2锛氬崐鎴愬搧")
- @TableField("type")
- private Integer type;
- /**
- * 鍨嬪彿瑙勬牸
- */
- @ApiModelProperty(name = "鍨嬪彿瑙勬牸")
- @TableField("specifications")
- private String specifications;
- /**
- * 鍗曚綅
- */
- @ApiModelProperty(name = "鍗曚綅")
- @TableField("unit")
- private String unit;
- /**
- * 鏁伴噺
- */
- @ApiModelProperty(name = "鏁伴噺")
- @TableField("number")
- private Integer number;
- /**
- * 鐘舵��,0:寰呯紪鍒�;1:宸茬紪鍒�
- */
- @ApiModelProperty(name = "鐘舵��,0:寰呯紪鍒�;1:宸茬紪鍒�")
- @TableField("state")
- private Integer state;
- /**
- * 涓嬪崟浜�
- */
- @ApiModelProperty(name = "涓嬪崟浜�")
- @TableField("username")
- private String username;
- /**
- * 涓嬪崟鏃ユ湡
- */
- @TableField(fill = FieldFill.INSERT)
- @ApiModelProperty(value = "涓嬪崟鏃ユ湡", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date createTime;
-
- @TableField(fill = FieldFill.INSERT_UPDATE)
- @ApiModelProperty(value = "鏇存柊鏃堕棿", hidden = true)
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date updateTime;
- /**
- * 浜よ揣鏃ユ湡
- */
- @ApiModelProperty(name = "浜よ揣鏃ユ湡")
- @TableField("delivery_time")
- @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
- private Date deliveryTime;
- /**
- * 瀹㈡埛鍚嶇О
- */
- @ApiModelProperty(name = "瀹㈡埛鍚嶇О")
- @TableField("custname")
- private String custname;
- /**
- * 鐪佷唤
- */
- @ApiModelProperty(name = "鐪佷唤")
- @TableField("province")
- private String province;
- /**
- * 閮ㄩ棬
- */
- @ApiModelProperty(name = "閮ㄩ棬")
- @TableField("department")
- private String department;
- /**
- * 涓氬姟鍛�
- */
- @ApiModelProperty(name = "涓氬姟鍛�")
- @TableField("salesman")
- private String salesman;
-}
-
diff --git a/standard-server/src/main/resources/mapper/OrdersMapper.xml b/standard-server/src/main/resources/mapper/OrdersMapper.xml
deleted file mode 100644
index f9aaada..0000000
--- a/standard-server/src/main/resources/mapper/OrdersMapper.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
-<mapper namespace="com.yuanchu.mom.mapper.OrdersMapper">
- <select id="selectAllOrder" resultType="java.util.Map">
- select o.id,
- order_code,
- department,
- province,
- salesman,
- proname,
- m.name,
- specifications,
- o.type,
- unit,
- number,
- DATE_FORMAT(o.create_time, '%Y-%m-%d') ,
- DATE_FORMAT(delivery_time, '%Y-%m-%d'),
- o.state
- from mom_ocean.orders o,mom_ocean.material m
- <where>
- <if test="orderCode != null and orderCode!=''">
- and order_code LIKE CONCAT('%',#{orderCode},'%')
- </if>
- <if test="time != null and time!=''">
- and o.create_time = #{time}
- </if>
- <if test="name != null and name!=''">
- and m.name LIKE CONCAT('%',#{name},'%')
- </if>
- <if test="state != null and state!=''">
- and o.state = #{state}
- </if>
- and o.code=m.code
- </where>
- order by o.id desc
- </select>
-</mapper>
\ No newline at end of file
diff --git a/system-run/pom.xml b/system-run/pom.xml
index 55499b0..426bf92 100644
--- a/system-run/pom.xml
+++ b/system-run/pom.xml
@@ -45,16 +45,6 @@
<artifactId>inventory-server</artifactId>
<version>0.0.1-SNAPSHOT</version>
</dependency>
- <dependency>
- <groupId>com.yuanchu.mom</groupId>
- <artifactId>inventory-server</artifactId>
- <version>0.0.1-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>com.yuanchu.mom</groupId>
- <artifactId>sale-server</artifactId>
- <version>1.0.0</version>
- </dependency>
<!--druid-->
<dependency>
--
Gitblit v1.9.3