From f1400115f582ae795913e360c0f5a70ea4513544 Mon Sep 17 00:00:00 2001
From: XiaoRuby <3114200645@qq.com>
Date: 星期一, 04 九月 2023 17:42:27 +0800
Subject: [PATCH] MOM系统-9-04 三个不合格查询
---
production-server/src/main/java/com/yuanchu/mom/pojo/ManualRawMaterial.java | 65 +++++
inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml | 87 ++++---
production-server/src/main/java/com/yuanchu/mom/pojo/dto/ReportAddDto.java | 22 ++
production-server/src/main/java/com/yuanchu/mom/service/impl/ManualRawMaterialServiceImpl.java | 20 +
production-server/src/main/java/com/yuanchu/mom/mapper/ManufactureReportMapper.java | 16 +
production-server/src/main/java/com/yuanchu/mom/mapper/ManualRawMaterialMapper.java | 16 +
production-server/src/main/java/com/yuanchu/mom/service/ManualUnfinishedProductService.java | 16 +
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java | 10
production-server/src/main/resources/mapper/ManufactureOrderMapper.xml | 8
inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java | 2
production-server/src/main/java/com/yuanchu/mom/pojo/ManualUnfinishedProduct.java | 68 ++++++
production-server/src/main/java/com/yuanchu/mom/service/impl/ManualUnfinishedProductServiceImpl.java | 20 +
inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java | 61 +++++
production-server/src/main/java/com/yuanchu/mom/mapper/ManualUnfinishedProductMapper.java | 16 +
production-server/src/main/resources/mapper/ManufactureReportMapper.xml | 5
inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java | 23 ++
production-server/src/main/resources/mapper/ManualTechnologyMapper.xml | 1
production-server/src/main/java/com/yuanchu/mom/service/ManufactureReportService.java | 16 +
system-run/src/main/resources/application-dev.yml | 4
inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java | 3
production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java | 1
production-server/src/main/resources/mapper/ManualUnfinishedProductMapper.xml | 5
production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml | 11
system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java | 2
production-server/src/main/resources/mapper/ManualRawMaterialMapper.xml | 5
production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureReportServiceImpl.java | 20 +
production-server/src/main/java/com/yuanchu/mom/service/ManualRawMaterialService.java | 16 +
production-server/src/main/java/com/yuanchu/mom/controller/ProductionReportController.java | 3
production-server/src/main/java/com/yuanchu/mom/pojo/ManufactureReport.java | 65 +++++
29 files changed, 554 insertions(+), 53 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
index e3b2c13..0d513ab 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/controller/InspectUnacceptedController.java
@@ -21,7 +21,6 @@
* @author zss
* @since 2023-08-07 10:04:01
*/
-@Api(tags = "QMS绠＄悊-->涓嶅悎鏍煎搧")
@RestController
@RequestMapping("/inspectUnaccepted")
public class InspectUnacceptedController {
@@ -30,7 +29,7 @@
private InspectUnacceptedService inspectUnacceptedService;
- @ApiOperation(value = "鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃")
+ @ApiOperation(value = "鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧绠＄悊")
@ApiImplicitParams(value = {
@ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
@ApiImplicitParam(name = "countSize",value = "鏉℃暟/椤�",dataTypeClass = Integer.class,required = true),
@@ -38,12 +37,68 @@
@ApiImplicitParam(name = "dealState",value = "澶勭悊鐘舵��(涓虹┖=鍏ㄩ儴)",dataTypeClass = Integer.class)
})
@GetMapping("/selectUnRawInspectsList")
- public Result selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState){
+ public Result<?> selectUnRawInspectsList(int pageSize, int countSize, String formTime, Integer dealState){
IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnRawInspectsList(new Page<Object>(pageSize, countSize), formTime,dealState);
Map<String, Object> map = new HashMap<>();
map.put("total", inspectionPage.getTotal());
map.put("row", inspectionPage.getRecords());
return Result.success(map);
}
+
+ @ApiOperation(value = "鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃", tags = "QMS绠＄悊-->鍘熸潗鏂欎笉鍚堟牸鍝�")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
+ @ApiImplicitParam(name = "countSize",value = "鏉℃暟/椤�",dataTypeClass = Integer.class,required = true),
+ @ApiImplicitParam(name = "formTime",value = "鏉ユ枡鏃ユ湡",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "productName",value = "浜у搧鍚嶇О",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "supplier",value = "渚涘簲鍟�",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "processingStatus",value = "澶勭悊鐘舵��",dataTypeClass = Integer.class)
+ })
+ @GetMapping("/selectURawMaterials")
+ public Result<?> selectUnqualifiedRawMaterials(int pageSize,
+ int countSize,
+ String formTime,
+ String productName,
+ String supplier,
+ Integer processingStatus){
+ IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectUnqualifiedRawMaterials(
+ new Page<Object>(pageSize, countSize),
+ formTime,
+ productName,
+ supplier,
+ processingStatus);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", inspectionPage.getTotal());
+ map.put("row", inspectionPage.getRecords());
+ return Result.success(map);
+ }
+
+ @ApiOperation(value = "涓嶅悎鏍煎搧鍒嗛〉鍒楄〃", tags = "QMS绠＄悊-->涓嶅悎鏍煎搧澶勭疆")
+ @ApiImplicitParams(value = {
+ @ApiImplicitParam(name = "pageSize",value = "椤垫暟",dataTypeClass = Integer.class,required = true),
+ @ApiImplicitParam(name = "countSize",value = "鏉℃暟/椤�",dataTypeClass = Integer.class,required = true),
+ @ApiImplicitParam(name = "specificationModel",value = "瑙勬牸鍨嬪彿",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "productName",value = "浜у搧鍚嶇О",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "productCategories",value = "浜у搧澶х被",dataTypeClass = String.class),
+ @ApiImplicitParam(name = "state",value = "鐘舵��",dataTypeClass = Integer.class)
+ })
+ @GetMapping("/selectDisposal")
+ public Result<?> selectDisposal(int pageSize,
+ int countSize,
+ String specificationModel,
+ String productName,
+ String productCategories,
+ Integer state){
+ IPage<Map<String, Object>> inspectionPage = inspectUnacceptedService.selectDisposal(
+ new Page<Object>(pageSize, countSize),
+ specificationModel,
+ productName,
+ productCategories,
+ state);
+ Map<String, Object> map = new HashMap<>();
+ map.put("total", inspectionPage.getTotal());
+ map.put("row", inspectionPage.getRecords());
+ return Result.success(map);
+ }
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
index c6a9145..6dab012 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/mapper/InspectUnacceptedMapper.java
@@ -17,5 +17,7 @@
//鏌ヨ鎴愬搧妫�楠屼腑涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
IPage<Map<String, Object>> selectInsList(Page<Object> page, String formTime, Integer dealState);
+
+ IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
index 5b3fb50..46d9076 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InspectUnaccepted.java
@@ -32,6 +32,9 @@
@TableId(type = IdType.AUTO)
private Integer id;
+ @ApiModelProperty(value = "0锛氬師鏉愭枡妫�楠屽崟锛�1锛氭垚鍝佹楠屽崟锛�2锛氬崐鎴愬搧妫�楠屽崟")
+ private Integer type;
+
/**
* 缂洪櫡鍚嶇О(鐞嗙敱)
**/
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
index b0cff7f..f95e13b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/InspectUnacceptedService.java
@@ -16,7 +16,7 @@
public interface InspectUnacceptedService extends IService<InspectUnaccepted> {
/**
- *鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
+ *鏌ヨ鎴愬搧涓嶅悎鏍煎搧妫�楠屽崟鍒楄〃
* @param
* @param formTime
* @param dealState
@@ -24,5 +24,26 @@
*/
IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState);
+ /**
+ * 鏌ヨ鍘熸潗鏂欎笉鍚堟牸鍝佹楠屽崟鍒楄〃
+ * @param page
+ * @param formTime
+ * @param productName
+ * @param supplier
+ * @param processingStatus
+ * @return
+ */
+ IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus);
+
+ /**
+ * 涓嶅悎鏍煎搧澶勭疆鍒嗛〉鍒楄〃
+ * @param page
+ * @param specificationModel
+ * @param productName
+ * @param productCategories
+ * @param state
+ * @return
+ */
+ IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, String productCategories, Integer state);
}
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
index 3b6d486..906b8b3 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/InspectUnacceptedServiceImpl.java
@@ -30,5 +30,15 @@
public IPage<Map<String, Object>> selectUnRawInspectsList(Page<Object> page, String formTime, Integer dealState) {
return inspectUnacceptedMapper.selectInsList(page, formTime, dealState);
}
+
+ @Override
+ public IPage<Map<String, Object>> selectUnqualifiedRawMaterials(Page<Object> page, String formTime, String productName, String supplier, Integer processingStatus) {
+ return inspectUnacceptedMapper.selectUnqualifiedRawMaterials(page, formTime, productName, supplier, processingStatus);
+ }
+
+ @Override
+ public IPage<Map<String, Object>> selectDisposal(Page<Object> page, String specificationModel, String productName, String productCategories, Integer state) {
+ return null;
+ }
}
diff --git a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
index e02d08b..7f46410 100644
--- a/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
+++ b/inspect-server/src/main/resources/mapper/InspectUnacceptedMapper.xml
@@ -1,60 +1,69 @@
<?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.InspectUnacceptedMapper">
- <select id="selectUnRawInspectsList" resultType="java.util.Map">
- select ru.id,
- DATE_FORMAT(form_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
- reason,
- code,
- name,
- specifications,
- unit,
- number,
- DATE_FORMAT(ri.create_time, '%Y-%m-%d') '鎶ユ鏃ユ湡',
- user_name,
- DATE_FORMAT(ins_time, '%Y-%m-%d') '妫�楠屾棩鏈�',
- deal_state,
- deal_reasult,
- DATE_FORMAT(deal_time, '%Y-%m-%d') '澶勭悊鏃ユ湡'
- from mom_ocean.raw_inspect ri inner join mom_ocean.inspect_unaccepted ru on ri.id = ru.raw_inspect_id
- <where>
- <if test="dealState!=null and dealState!=''">
- and deal_state=#{dealState}
- </if>
- <if test="formTime!=null and formTime!=''">
- and form_time=#{formTime}
- </if>
- and ru.state=1
- </where>
- order by ru.id desc
- </select>
+
<select id="selectInsList" resultType="java.util.Map">
- select ru.id,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') '鏉ユ枡鏃ユ湡',
+ SELECT ru.id,
+ DATE_FORMAT(fi.create_time, '%Y-%m-%d') dateArrival,
reason,
material_code,
- name,
+ project_name,
+ u.`name`,
specifications_model,
unit,
quantity,
- DATE_FORMAT(fi.create_time, '%Y-%m-%d') '鎶ユ鏃ユ湡',
+ DATE_FORMAT(fi.create_time, '%Y-%m-%d') inspectionDate,
u.name,
- DATE_FORMAT(fi.update_time, '%Y-%m-%d') '妫�楠屾棩鏈�',
deal_state,
deal_reasult,
- DATE_FORMAT(deal_time, '%Y-%m-%d') '澶勭悊鏃ユ湡'
- from mom_ocean.inspect_unaccepted ru,
- mom_ocean.finished_inspect fi ,
- mom_ocean.user u
+ DATE_FORMAT(deal_time, '%Y-%m-%d') processingDate
+ FROM (inspect_unaccepted ru,
+ `user` u)
+ LEFT JOIN finished_inspect fi ON fi.`id` = ru.`raw_inspect_id`
where fi.id = ru.raw_inspect_id
- and fi.user_id=u.id
+ AND ru.type = 1
+ AND ru.state=1
+ AND fi.`user_id` = u.`id`
<if test="dealState!=null and dealState!=''">
and deal_state=#{dealState}
</if>
<if test="formTime!=null and formTime!=''">
and fi.create_time=#{formTime}
</if>
- and ru.state=1
order by ru.id desc
</select>
-</mapper>
\ No newline at end of file
+
+ <select id="selectUnqualifiedRawMaterials" resultType="map">
+ SELECT i.id,
+ DATE_FORMAT(r.create_time, '%Y-%m-%d') dateArrival,
+ i.`reason`,
+ r.`code`,
+ r.`name`,
+ r.`specifications`,
+ r.`unit`,
+ r.`number`,
+ DATE_FORMAT(r.`create_time`,'%Y-%m-%d') inspectionDate,
+ r.`user_name`,
+ DATE_FORMAT(r.`ins_time`,'%Y-%m-%d') processingDate,
+ r.`supplier`,
+ i.`deal_state`,
+ i.`deal_reasult`
+ FROM inspect_unaccepted i
+ LEFT JOIN raw_inspect r ON i.`raw_inspect_id` = r.`id`
+ WHERE i.`state` = 1
+ AND i.`type` = 0
+ <if test="formTime != null and formTime != ''">
+ AND r.create_time = #{formTime}
+ </if>
+ <if test="productName != null and productName != ''">
+ AND r.name LIKE CONCAT('%', #{productName}, '%')
+ </if>
+ <if test="supplier != null and supplier != ''">
+ AND r.supplier LIKE CONCAT('%', #{supplier}, '%')
+ </if>
+ <if test="processingStatus != null">
+ AND i.deal_state = #{processingStatus}
+ </if>
+ ORDER BY i.`id` DESC
+ </select>
+</mapper>
diff --git a/production-server/src/main/java/com/yuanchu/mom/controller/ProductionReportController.java b/production-server/src/main/java/com/yuanchu/mom/controller/ProductionReportController.java
index 9f55189..65e230a 100644
--- a/production-server/src/main/java/com/yuanchu/mom/controller/ProductionReportController.java
+++ b/production-server/src/main/java/com/yuanchu/mom/controller/ProductionReportController.java
@@ -42,8 +42,7 @@
@ApiOperation(value = "鐐瑰嚮鏂板-->鏌ヨ鎵�鏈夋帓浜ц鍒�")
@PostMapping("add_show_scheduling")
public Result<?> reportSelectScheduling() {
- manufactureSchedulingService.reportSelectScheduling();
- return Result.success();
+ return Result.success(manufactureSchedulingService.reportSelectScheduling());
}
@ApiOperation(value = "鎶ュ伐澧炲姞")
diff --git a/production-server/src/main/java/com/yuanchu/mom/mapper/ManualRawMaterialMapper.java b/production-server/src/main/java/com/yuanchu/mom/mapper/ManualRawMaterialMapper.java
new file mode 100644
index 0000000..4453d6e
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/mapper/ManualRawMaterialMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.ManualRawMaterial;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐-->鍘熸潗鏂欓鐢� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:39:07
+ */
+public interface ManualRawMaterialMapper extends BaseMapper<ManualRawMaterial> {
+
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/mapper/ManualUnfinishedProductMapper.java b/production-server/src/main/java/com/yuanchu/mom/mapper/ManualUnfinishedProductMapper.java
new file mode 100644
index 0000000..c86eb71
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/mapper/ManualUnfinishedProductMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.ManualUnfinishedProduct;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐-->鍗婃垚鍝侀鐢� Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:39:26
+ */
+public interface ManualUnfinishedProductMapper extends BaseMapper<ManualUnfinishedProduct> {
+
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/mapper/ManufactureReportMapper.java b/production-server/src/main/java/com/yuanchu/mom/mapper/ManufactureReportMapper.java
new file mode 100644
index 0000000..b0a08a4
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/mapper/ManufactureReportMapper.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.mapper;
+
+import com.yuanchu.mom.pojo.ManufactureReport;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 鐢熶骇绠＄悊-->鐢熶骇鎶ュ伐 Mapper 鎺ュ彛
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:43:26
+ */
+public interface ManufactureReportMapper extends BaseMapper<ManufactureReport> {
+
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/pojo/ManualRawMaterial.java b/production-server/src/main/java/com/yuanchu/mom/pojo/ManualRawMaterial.java
new file mode 100644
index 0000000..bdfedc5
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/pojo/ManualRawMaterial.java
@@ -0,0 +1,65 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐-->鍘熸潗鏂欓鐢�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:39:07
+ */
+@Getter
+@Setter
+@TableName("manual_raw_material")
+@ApiModel(value = "ManualRawMaterial瀵硅薄", description = "鐢熶骇鎶ュ伐-->鍘熸潗鏂欓鐢�")
+public class ManualRawMaterial implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("涓婚敭Id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("渚涘簲鍟嗗悕绉�")
+ private String supplierName;
+
+ @ApiModelProperty("璐ㄩ噺杩芥函鍙�")
+ private String qualityNumber;
+
+ @ApiModelProperty("瑙勬牸鍨嬪彿")
+ private String specificationsModels;
+
+ @ApiModelProperty("鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty("鏁伴噺")
+ private Integer number;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("閫昏緫鍒犻櫎")
+ @TableLogic
+ private Integer state;
+
+ @ApiModelProperty("鍏宠仈 鐢熶骇鎶ュ伐Id")
+ private Integer manufactureReportId;
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/pojo/ManualUnfinishedProduct.java b/production-server/src/main/java/com/yuanchu/mom/pojo/ManualUnfinishedProduct.java
new file mode 100644
index 0000000..a4182c6
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/pojo/ManualUnfinishedProduct.java
@@ -0,0 +1,68 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐-->鍗婃垚鍝侀鐢�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:39:26
+ */
+@Getter
+@Setter
+@TableName("manual_unfinished_product")
+@ApiModel(value = "ManualUnfinishedProduct瀵硅薄", description = "鐢熶骇鎶ュ伐-->鍗婃垚鍝侀鐢�")
+public class ManualUnfinishedProduct implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("涓婚敭Id")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鐢熶骇鐝粍")
+ private String productionTeam;
+
+ @ApiModelProperty("璐ㄩ噺杩芥函鍙�")
+ private String qualityNumber;
+
+ @ApiModelProperty("鍗婃垚鍝佸悕绉�")
+ private String unfinishedName;
+
+ @ApiModelProperty("瑙勬牸鍨嬪彿")
+ private String specificationsModels;
+
+ @ApiModelProperty("鍗曚綅")
+ private String unit;
+
+ @ApiModelProperty("鏁伴噺")
+ private Integer number;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("閫昏緫鍒犻櫎")
+ @TableLogic
+ private Integer state;
+
+ @ApiModelProperty("鍏宠仈 鐢熶骇鎶ュ叡Id")
+ private Integer manufactureReportId;
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/pojo/ManufactureReport.java b/production-server/src/main/java/com/yuanchu/mom/pojo/ManufactureReport.java
new file mode 100644
index 0000000..ff80421
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/pojo/ManufactureReport.java
@@ -0,0 +1,65 @@
+package com.yuanchu.mom.pojo;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 鐢熶骇绠＄悊-->鐢熶骇鎶ュ伐
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:43:26
+ */
+@Getter
+@Setter
+@TableName("manufacture_report")
+@ApiModel(value = "ManufactureReport瀵硅薄", description = "鐢熶骇绠＄悊-->鐢熶骇鎶ュ伐")
+public class ManufactureReport implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ @ApiModelProperty("鐢熶骇鎶ュ伐 涓婚敭ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Integer id;
+
+ @ApiModelProperty("鐝")
+ private String orderClasses;
+
+ @ApiModelProperty("鐝粍")
+ private String workingTeam;
+
+ @ApiModelProperty("鐝粍闀�")
+ private String jobForeman;
+
+ @ApiModelProperty("鍑哄嫟浜哄憳")
+ private String attendant;
+
+ @ApiModelProperty("鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty("鏇存柊鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
+ @ApiModelProperty("閫昏緫鍒犻櫎")
+ @TableLogic
+ private Integer state;
+
+ @ApiModelProperty("鍏宠仈 宸ュ簭宸ヨ壓Id")
+ private Integer processTechnology;
+
+ @ApiModelProperty("鍏宠仈 鐢熶骇璁㈠崟鍙稩d")
+ private Integer manufactureOrderId;
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/pojo/dto/ReportAddDto.java b/production-server/src/main/java/com/yuanchu/mom/pojo/dto/ReportAddDto.java
new file mode 100644
index 0000000..1d09bf6
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/pojo/dto/ReportAddDto.java
@@ -0,0 +1,22 @@
+package com.yuanchu.mom.pojo.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+// 鎶ュ伐娣诲姞
+@Data
+public class ReportAddDto {
+
+ @ApiModelProperty("鐝")
+ private String orderClasses;
+
+ @ApiModelProperty("鐝粍")
+ private String workingTeam;
+
+ @ApiModelProperty("鐝粍闀�")
+ private String jobForeman;
+
+ @ApiModelProperty("鍑哄嫟浜哄憳")
+ private String attendant;
+
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/service/ManualRawMaterialService.java b/production-server/src/main/java/com/yuanchu/mom/service/ManualRawMaterialService.java
new file mode 100644
index 0000000..6b3d74e
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/service/ManualRawMaterialService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.ManualRawMaterial;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐-->鍘熸潗鏂欓鐢� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:39:07
+ */
+public interface ManualRawMaterialService extends IService<ManualRawMaterial> {
+
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/service/ManualUnfinishedProductService.java b/production-server/src/main/java/com/yuanchu/mom/service/ManualUnfinishedProductService.java
new file mode 100644
index 0000000..6d3dd5b
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/service/ManualUnfinishedProductService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.ManualUnfinishedProduct;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐-->鍗婃垚鍝侀鐢� 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:39:26
+ */
+public interface ManualUnfinishedProductService extends IService<ManualUnfinishedProduct> {
+
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/service/ManufactureReportService.java b/production-server/src/main/java/com/yuanchu/mom/service/ManufactureReportService.java
new file mode 100644
index 0000000..6aa721a
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/service/ManufactureReportService.java
@@ -0,0 +1,16 @@
+package com.yuanchu.mom.service;
+
+import com.yuanchu.mom.pojo.ManufactureReport;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 鐢熶骇绠＄悊-->鐢熶骇鎶ュ伐 鏈嶅姟绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:43:26
+ */
+public interface ManufactureReportService extends IService<ManufactureReport> {
+
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManualRawMaterialServiceImpl.java b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManualRawMaterialServiceImpl.java
new file mode 100644
index 0000000..162a50d
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManualRawMaterialServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.service.impl;
+
+import com.yuanchu.mom.pojo.ManualRawMaterial;
+import com.yuanchu.mom.mapper.ManualRawMaterialMapper;
+import com.yuanchu.mom.service.ManualRawMaterialService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐-->鍘熸潗鏂欓鐢� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:39:07
+ */
+@Service
+public class ManualRawMaterialServiceImpl extends ServiceImpl<ManualRawMaterialMapper, ManualRawMaterial> implements ManualRawMaterialService {
+
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManualUnfinishedProductServiceImpl.java b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManualUnfinishedProductServiceImpl.java
new file mode 100644
index 0000000..bf49dd6
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManualUnfinishedProductServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.service.impl;
+
+import com.yuanchu.mom.pojo.ManualUnfinishedProduct;
+import com.yuanchu.mom.mapper.ManualUnfinishedProductMapper;
+import com.yuanchu.mom.service.ManualUnfinishedProductService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鐢熶骇鎶ュ伐-->鍗婃垚鍝侀鐢� 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:39:26
+ */
+@Service
+public class ManualUnfinishedProductServiceImpl extends ServiceImpl<ManualUnfinishedProductMapper, ManualUnfinishedProduct> implements ManualUnfinishedProductService {
+
+}
diff --git a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java
index b99ce24..d9c364c 100644
--- a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java
+++ b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureOrderServiceImpl.java
@@ -51,7 +51,6 @@
public Map<String, Object> sePros(Integer schedulingId) {
//鍩烘湰淇℃伅
Map<String, Object> manufactureOrder = manufactureSchedulingService.sePros(schedulingId);
- MyUtil.PrintLog(manufactureOrder.toString());
//璁″垝缂栧埗
List<Map<String, Object>> mapList = manualTechnologyMapper.selectListTowTree(schedulingId);
manufactureOrder.put("message",mapList);
diff --git a/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureReportServiceImpl.java b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureReportServiceImpl.java
new file mode 100644
index 0000000..10ac933
--- /dev/null
+++ b/production-server/src/main/java/com/yuanchu/mom/service/impl/ManufactureReportServiceImpl.java
@@ -0,0 +1,20 @@
+package com.yuanchu.mom.service.impl;
+
+import com.yuanchu.mom.pojo.ManufactureReport;
+import com.yuanchu.mom.mapper.ManufactureReportMapper;
+import com.yuanchu.mom.service.ManufactureReportService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 鐢熶骇绠＄悊-->鐢熶骇鎶ュ伐 鏈嶅姟瀹炵幇绫�
+ * </p>
+ *
+ * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
+ * @since 2023-09-04 10:43:26
+ */
+@Service
+public class ManufactureReportServiceImpl extends ServiceImpl<ManufactureReportMapper, ManufactureReport> implements ManufactureReportService {
+
+}
diff --git a/production-server/src/main/resources/mapper/ManualRawMaterialMapper.xml b/production-server/src/main/resources/mapper/ManualRawMaterialMapper.xml
new file mode 100644
index 0000000..ff02909
--- /dev/null
+++ b/production-server/src/main/resources/mapper/ManualRawMaterialMapper.xml
@@ -0,0 +1,5 @@
+<?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.ManualRawMaterialMapper">
+
+</mapper>
diff --git a/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml b/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
index 34626e7..752abcd 100644
--- a/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
+++ b/production-server/src/main/resources/mapper/ManualTechnologyMapper.xml
@@ -44,5 +44,6 @@
LEFT JOIN manual_technology t ON t.`id` = p.`manual_technology_id`
WHERE p.`state` = 1
AND p.`manufacture_scheduling_id` = #{schedulingId}
+ ORDER BY p.`create_time` DESC
</select>
</mapper>
diff --git a/production-server/src/main/resources/mapper/ManualUnfinishedProductMapper.xml b/production-server/src/main/resources/mapper/ManualUnfinishedProductMapper.xml
new file mode 100644
index 0000000..619f801
--- /dev/null
+++ b/production-server/src/main/resources/mapper/ManualUnfinishedProductMapper.xml
@@ -0,0 +1,5 @@
+<?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.ManualUnfinishedProductMapper">
+
+</mapper>
diff --git a/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml b/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml
index 3cbca96..c566229 100644
--- a/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml
+++ b/production-server/src/main/resources/mapper/ManufactureOrderMapper.xml
@@ -15,9 +15,9 @@
scheduled_production,
DATE_FORMAT(downTime, '%Y-%m-%d') downTime,
DATE_FORMAT(delTime, '%Y-%m-%d') delTime,
- go_state,
+ go_state
from mom_ocean.manufacture_order
- where state=1
+ where state = 1
<if test="downTime!=null and downTime!=''">
and downTime=#{downTime}
</if>
@@ -28,8 +28,9 @@
and customer_code like concat('%',#{customerCode},'%')
</if>
<if test="type!=null">
- and type=#{type}
+ and go_state=#{type}
</if>
+ ORDER BY create_time DESC
</select>
<update id="deleteManufacture">
@@ -55,6 +56,7 @@
SELECT m.`order_code`, m.`name`, m.`id`
FROM manufacture_order m
WHERE m.`state` = 1
+ ORDER BY m.`create_time` DESC
</select>
<update id="updateManufacture">
diff --git a/production-server/src/main/resources/mapper/ManufactureReportMapper.xml b/production-server/src/main/resources/mapper/ManufactureReportMapper.xml
new file mode 100644
index 0000000..480b45e
--- /dev/null
+++ b/production-server/src/main/resources/mapper/ManufactureReportMapper.xml
@@ -0,0 +1,5 @@
+<?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.ManufactureReportMapper">
+
+</mapper>
diff --git a/production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml b/production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml
index fbb0c11..e946e8a 100644
--- a/production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml
+++ b/production-server/src/main/resources/mapper/ManufactureSchedulingMapper.xml
@@ -9,6 +9,7 @@
FROM manufacture_scheduling m
WHERE m.`manufacture_order_id` = 3
AND m.`state` = 1
+ ORDER BY m.`create_time` DESC
</select>
<select id="selectProduceTable" resultType="map">
@@ -18,6 +19,7 @@
WHERE m.`manufacture_order_id` = #{manOrdId}
AND m.`manufacture_order_id` = o.`id`
AND m.`state` = 1
+ AND m.`go_state` = 1
<if test="productName != null and productName != ''">
AND o.`name` LIKE CONCAT('%', #{productName}, '%')
</if>
@@ -27,6 +29,7 @@
<if test="endTime != null and endTime != ''">
AND m.`end_time` <![CDATA[ <= ]]> #{endTime}
</if>
+ ORDER BY m.`create_time` DESC
</select>
<select id="sePros" resultType="map">
@@ -35,9 +38,15 @@
FROM manufacture_scheduling s, manufacture_order o
WHERE s.`manufacture_order_id` = o.`id`
AND s.`id` = #{schedulingId}
+ ORDER BY s.`create_time` DESC
</select>
<select id="reportSelectScheduling" resultType="map">
-
+ SELECT m.`id`, o.`customer_code`, o.`proname`, o.`name`, o.`specifications`, o.`unit`, m.`scheduled`
+ FROM manufacture_scheduling m, manufacture_order o
+ WHERE m.`state` = 1
+ AND m.`manufacture_order_id` = o.`id`
+ AND m.`go_state` = 1
+ ORDER BY m.`create_time` DESC
</select>
</mapper>
diff --git a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
index eff1884..03f14da 100644
--- a/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
+++ b/system-run/src/main/java/com/yuanchu/mom/CodeGenerator.java
@@ -15,7 +15,7 @@
// 婕旂ず渚嬪瓙锛屾墽琛� main 鏂规硶鎺у埗鍙拌緭鍏ユā鍧楄〃鍚嶅洖杞﹁嚜鍔ㄧ敓鎴愬搴旈」鐩洰褰曚腑
public class CodeGenerator {
- public static String database_url = "jdbc:mysql://192.168.110.209:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
+ public static String database_url = "jdbc:mysql://192.168.191.113:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai";
public static String database_username = "user";
public static String database_password= "123456";
public static String author = "姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃";
diff --git a/system-run/src/main/resources/application-dev.yml b/system-run/src/main/resources/application-dev.yml
index f6f3fa1..c5fbcf7 100644
--- a/system-run/src/main/resources/application-dev.yml
+++ b/system-run/src/main/resources/application-dev.yml
@@ -34,7 +34,7 @@
datasource:
type: com.alibaba.druid.pool.DruidDataSource
driverClassName: com.mysql.cj.jdbc.Driver
- url: jdbc:mysql://192.168.191.113:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
+ url: jdbc:mysql://192.168.73.113:3306/mom_ocean?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8
username: user
password: 123456
druid:
@@ -59,7 +59,7 @@
# redis鏁版嵁搴撶储寮�(榛樿涓�0)锛屾垜浠娇鐢ㄧ储寮曚负3鐨勬暟鎹簱锛岄伩鍏嶅拰鍏朵粬鏁版嵁搴撳啿绐�
database: 0
# redis鏈嶅姟鍣ㄥ湴鍧�锛堥粯璁や负localhost锛�
- host: 192.168.191.113
+ host: 192.168.73.113
# redis绔彛锛堥粯璁や负6379锛�
port: 6379
# redis璁块棶瀵嗙爜锛堥粯璁や负绌猴級
--
Gitblit v1.9.3