From ba261c8e324104aa36ab2e9ebd3bff3986a44b6f Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Thu, 19 Oct 2023 09:28:37 +0800
Subject: [PATCH 1/3] gai
---
.idea/workspace.xml | 70 ++++++++++++-------
.../controller/jhgk/DmSygdMxController.java | 12 ----
2 files changed, 44 insertions(+), 38 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9c7b508..c8adf55 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,16 +5,6 @@
-
-
-
-
-
-
-
-
-
-
@@ -184,20 +174,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -239,7 +219,7 @@
"RequestMappingsPanelWidth1": "75",
"RunOnceActivity.ShowReadmeOnStart": "true",
"WebServerToolWindowFactoryState": "false",
- "last_opened_file_path": "E:/runpeng/gjerp_ui",
+ "last_opened_file_path": "E:/runpeng/gj_erp_new",
"node.js.detected.package.eslint": "true",
"node.js.detected.package.tslint": "true",
"node.js.selected.package.eslint": "(autodetect)",
@@ -285,6 +265,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -333,6 +326,7 @@
+
@@ -480,12 +497,13 @@
-
-
+
+
+
diff --git a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
index 4d87322..3341a68 100644
--- a/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/jhgk/DmSygdMxController.java
@@ -70,17 +70,5 @@ public class DmSygdMxController {
return service.tqSygd();
}
- public static void main(String[] agrs){
-// String[] a={"序号","产品","批量","分段","板数","上料","型材抛丸","抛丸","一垮龙门板数","一垮数控板数","坡口切割结束","二垮数控板数","数控切割开始","坡口切割结束","三垮数控板数","数控切割开始","坡口切割结束","三垮平铁板数","平铁切割开始","平铁切割结束","曲平铁转结束","曲平铁结束","曲外板结束","组立","数控 板数","数控切割开始","坡口切割结束","面板挤边","七垮型 材米数","型材 面板","小组配送结束","光电 结束","备注"};
-// String[] a={"船名","批量","图名","科室","套料图下发","套料图生产需求期","套料图接收","板材领取表下发","板材领取表生产需求期","板材领取表接收","零件配套表下发","零件配套表生产需求期","零件配套表接收"};
-// String[] a={"船号","订货清单号","期次","需求日期","实际到货日期","物料号","材质MATERIAL","厚度THICK.mm","宽度WIDTHmm","长度LENGTHmm","重量吨/张WEIGHTTON/PIECE","设计数量张DESIGNPIECE","裕量张MARGINPIECE","总数量张TOTALPIECE","总重量吨TOTALTON ","利库数量张STOREPIECE","利库重量吨STORETON","实订数量张ORDERPIECE","实订重量吨ORDERTON","备注NOTE"};
-// for (int i = 0; i < a.length; i++) {
-// System.out.println("{ field: '', title: '"+a[i]+"', width: 120, editRender: { name: 'input' },\n" +
-// " filters: [{ data: { checks: [], sVal: '', sMenu: '', fType1: '', fVal1: '', fMode: 'and', fType2: '', fVal2: '' } }],\n" +
-// " filterRender: { name: 'FilterCombination', },\n" +
-// " },");
-// }
-
- }
}
From c4468ef9466225a7246d6fdb59acf0d60883e225 Mon Sep 17 00:00:00 2001
From: xiezuo003
Date: Sat, 21 Oct 2023 18:44:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?1019=E6=96=87=E6=A1=A3=E9=9C=80=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/workspace.xml | 382 ++++--------------
.../com/dsic/gj_erp/bean/jcsj/EmGcrl.java | 11 +
.../com/dsic/gj_erp/bean/jcsj/EmSbcnp.java | 12 +
.../com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java | 3 +
.../com/dsic/gj_erp/bean/jhgk/DmXbjh.java | 90 +----
.../gj_erp/bean/request/EmSbwxjhBean.java | 2 +
.../dsic/gj_erp/controller/SYController.java | 12 +-
.../gj_erp/dao/sy/Dm_zhbmpRepository.java | 9 +-
.../gj_erp/service/jcsj/EmSbjbbService.java | 2 +
.../service/jcsj/impl/EmGcrlServiceImpl.java | 3 +
.../service/jcsj/impl/EmSbcnpServiceImpl.java | 6 +
.../service/jcsj/impl/EmSbjbbServiceImpl.java | 1 +
.../jcsj/impl/EmSbwxjhServiceImpl.java | 4 +
.../jhgk/impl/DmJtsyjhServiceImpl.java | 11 +-
.../service/jhgk/impl/DmTzjhServiceImpl.java | 3 +
.../service/jhgk/impl/DmXbjhServiceImpl.java | 22 +-
.../service/jhgk/impl/DmZrcjhServiceImpl.java | 11 +-
.../com/dsic/gj_erp/service/sy/SYService.java | 13 +
.../java/com/dsic/gj_erp/util/ExcelUtil.java | 23 +-
19 files changed, 209 insertions(+), 411 deletions(-)
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c8adf55..8e628b5 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,180 +4,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -200,97 +46,47 @@
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -304,15 +100,15 @@
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -324,14 +120,6 @@
-
-
-
-
@@ -366,31 +154,10 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
1695345779307
@@ -462,21 +229,7 @@
1695353309158
-
- 1697167182055
-
-
-
- 1697167182055
-
-
- 1697547818761
-
-
-
- 1697547818761
-
-
+
@@ -492,24 +245,27 @@
+
+
-
-
-
+
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java
index d51e595..54384fd 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmGcrl.java
@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
+import io.swagger.models.auth.In;
import lombok.Data;
import lombok.EqualsAndHashCode;
@@ -46,5 +47,15 @@ public class EmGcrl implements Serializable {
@ApiModelProperty(value = "备注")
private String bz;
+ @ApiModelProperty(value = "星期（星期几）")
+ private String xq;
+ @ApiModelProperty(value = "月周（一月中的第几周）")
+ private String yz;
+
+ @ApiModelProperty(value = "年周（一年中的第几周）")
+ private String nz;
+
+ @ApiModelProperty(value = "工作日历（一年中的第几天）")
+ private String gzlr;
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
index d4a519d..a631014 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbcnp.java
@@ -39,6 +39,18 @@ public class EmSbcnp implements Serializable {
@TableField("SBMC")
private String sbmc;
+ @ApiModelProperty(value = "所属部门")
+ @TableField("SZCS")
+ private String szcs;
+
+ @ApiModelProperty(value = "跨位")
+ @TableField("KW")
+ private String kw;
+
+ @ApiModelProperty(value = "工序")
+ @TableField("GX")
+ private String gx;
+
@ApiModelProperty(value = "产能")
private Double sbcn;
diff --git a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java
index 73f8aa2..85bb06a 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jcsj/EmSbrydyp.java
@@ -54,6 +54,9 @@ public class EmSbrydyp implements Serializable {
@TableField("YLZD1")
private String ylzd1;
+ @TableField("SZCS")
+ private String szcs;
+
@TableField("SBBH")
@Id
@ApiModelProperty(value = "设备编号")
diff --git a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java
index 43fada1..d1cb745 100644
--- a/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java
+++ b/src/main/java/com/dsic/gj_erp/bean/jhgk/DmXbjh.java
@@ -31,90 +31,28 @@ public class DmXbjh implements Serializable {
private static final long serialVersionUID=1L;
-// @ExcelProperty("学生编号")
- @ApiModelProperty(value = "状态； 0未提交1已提交；默认为0；")
- private String zt;
-
-// @ExcelProperty("学生编号")
- @ApiModelProperty(value = "2023年01月的 产量，后面字段以此类推")
- @TableField("cl_202301")
- private Double cl202301;
-
- @TableField("cl_202405")
- private Double cl202405;
-
- @TableField("cl_202411")
- private Double cl202411;
-
- @TableField("cl_202303")
- private Double cl202303;
-
- @TableField("cl_202408")
- private Double cl202408;
-
- @TableField("cl_202402")
- private Double cl202402;
-
- @TableField("cl_202306")
- private Double cl202306;
-
- @TableField("cl_202407")
- private Double cl202407;
-
- @TableField("cl_202501")
- private Double cl202501;
-
@Id
- @TableId(value = "dc_ch", type = IdType.ASSIGN_UUID)
- private String dcCh;
+ @TableId(value = "id", type = IdType.ASSIGN_UUID)
+ private String id;
- @TableField("cl_202311")
- private Double cl202311;
+ @ApiModelProperty(value = "年份")
+ private String nf;
- @TableField("cl_202305")
- private Double cl202305;
+ @ApiModelProperty(value = "月份")
+ private String yf;
- @TableField("cl_202410")
- private Double cl202410;
+ @ApiModelProperty(value = "重量")
+ private Double zl;
- @TableField("cl_202308")
- private Double cl202308;
+ @ApiModelProperty(value = "有效年份")
+ private String yxnf;
- @TableField("cl_202302")
- private Double cl202302;
-
- @TableField("cl_202307")
- private Double cl202307;
-
- @TableField("cl_202401")
- private Double cl202401;
-
- @TableField("cl_202404")
- private Double cl202404;
-
- @TableField("cl_202412")
- private Double cl202412;
-
- @TableField("cl_202310")
- private Double cl202310;
-
- @TableField("cl_202304")
- private Double cl202304;
-
- @TableField("cl_202409")
- private Double cl202409;
-
- @TableField("cl_202403")
- private Double cl202403;
-
- @TableField("cl_202309")
- private Double cl202309;
+ @ApiModelProperty(value = "状态")
+ private String zt;
- @TableField("cl_202406")
- private Double cl202406;
+ @ApiModelProperty(value = "船号")
+ private String dcCh;
- @TableField("cl_202312")
- private Double cl202312;
}
diff --git a/src/main/java/com/dsic/gj_erp/bean/request/EmSbwxjhBean.java b/src/main/java/com/dsic/gj_erp/bean/request/EmSbwxjhBean.java
index 2fbc4d1..bb5f1f1 100644
--- a/src/main/java/com/dsic/gj_erp/bean/request/EmSbwxjhBean.java
+++ b/src/main/java/com/dsic/gj_erp/bean/request/EmSbwxjhBean.java
@@ -11,4 +11,6 @@ public class EmSbwxjhBean {
private String beginTime;
@ApiModelProperty(value = "计划结束时间yyyy/MM/dd")
private String endTime;
+ @ApiModelProperty(value = "所属部门")
+ private String szcs;
}
diff --git a/src/main/java/com/dsic/gj_erp/controller/SYController.java b/src/main/java/com/dsic/gj_erp/controller/SYController.java
index d346f38..b7e4d69 100644
--- a/src/main/java/com/dsic/gj_erp/controller/SYController.java
+++ b/src/main/java/com/dsic/gj_erp/controller/SYController.java
@@ -10,10 +10,7 @@ import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import java.util.List;
import java.util.Map;
@@ -268,4 +265,11 @@ public class SYController {
return new ResultBean(map);
}
+ @ApiOperation(value = "设备信息转码")
+ @RequestMapping(value = "/emSbjbbZM")
+ public ResultBean em_sbjbb_ZM(@RequestParam String bmlb) {
+ List