From c3d68f210192e2ec5bd06e4d21ede0bd8305fd63 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期三, 19 六月 2024 17:31:03 +0800
Subject: [PATCH] change table name
---
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java | 2
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java | 41 ++++++++++++-
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java | 2
pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java | 58 +++++++++++++++++++
pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml | 45 +++++++++++++++
pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proTestItems/ProTestItemsCtrl.java | 24 ++++----
6 files changed, 156 insertions(+), 16 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java
index a6c101c..eb23622 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/daoPr/PrAssemblyPlanMapper.java
@@ -34,4 +34,6 @@
int deleteLogicById(Long id);
boolean exists(String name, Long id);
+
+ List<PrAssemblyPlan> selectList(PrAssemblyPlan params);
}
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 6082990..7f250eb 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -56,6 +56,51 @@
where id = #{id,jdbcType=BIGINT}
</select>
+ <select id="selectList" resultMap="BaseResultMap" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
+ select
+ <include refid="Base_Column_List" />
+ from pr_assembly_plan
+ <trim prefix="where" suffixOverrides="and">
+ <if test="proId != null">
+ pro_id = #{proId,jdbcType=BIGINT} and
+ </if>
+ <if test="batchId != null">
+ batch_id = #{batchId,jdbcType=BIGINT} and
+ </if>
+ <if test="processId != null">
+ process_id = #{processId,jdbcType=BIGINT} and
+ </if>
+ <if test="name != null">
+ name = #{name,jdbcType=VARCHAR} and
+ </if>
+ <if test="number != null">
+ number = #{number,jdbcType=INTEGER} and
+ </if>
+ <if test="status != null">
+ status = #{status,jdbcType=TINYINT} and
+ </if>
+ <if test="creator != null">
+ creator = #{creator,jdbcType=VARCHAR} and
+ </if>
+ <if test="dt != null">
+ dt = #{dt,jdbcType=TIMESTAMP} and
+ </if>
+ <if test="startDate != null">
+ start_date = #{startDate,jdbcType=VARCHAR} and
+ </if>
+ <if test="endDate != null">
+ end_date = #{endDate,jdbcType=VARCHAR} and
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT} and
+ </if>
+ <if test="content != null">
+ content = #{content,jdbcType=VARCHAR} and
+ </if>
+ </trim>
+ order by id desc
+ </select>
+
<delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
delete from pr_assembly_plan
where id = #{id,jdbcType=BIGINT}
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
index 59af6ee..e52b152 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proItems/ProItemsCtrl.java
@@ -118,7 +118,7 @@
@PostMapping(path="disabled")
@SsoPowerAop(power = "10100011")
@Log("绂佺敤鎴栧惎鐢ㄨ川妫�椤圭洰")
- public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
+ public BaseResponse<Boolean> disabled(@RequestBody PltProductQualityInspectionItems reason){
int count = sv.disabled(reason.id,reason.disabled);
if (count <= 0) {
diff --git a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proTestItems/ProTestItemsCtrl.java b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proTestItems/ProTestItemsCtrl.java
index 21aa27d..5bcf5e9 100644
--- a/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proTestItems/ProTestItemsCtrl.java
+++ b/pms-parent/pms-web-platform/src/main/java/com/dy/pmsPlatform/proTestItems/ProTestItemsCtrl.java
@@ -29,13 +29,13 @@
}
/**
- * 淇濆瓨浜у搧鍝佽川妫�鏌ラ」鐩�
+ * 淇濆瓨浜у搧娴嬭瘯妫�鏌ラ」鐩�
* @param item
* @return
*/
@PostMapping(path="save")
@SsoPowerAop(power = "10300003")
- @Log("淇濆瓨浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
+ @Log("淇濆瓨浜у搧娴嬭瘯妫�鏌ラ」鐩俊鎭�")
public BaseResponse<Boolean> save(@RequestBody @Valid PltProductTestInspectionItems item){
item.deleted = false;
item.disabled = false;
@@ -49,13 +49,13 @@
/**
- * 鏇存柊浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�
+ * 鏇存柊浜у搧娴嬭瘯妫�鏌ラ」鐩俊鎭�
* @param item
* @return
*/
@PostMapping(path="update")
@SsoPowerAop(power = "10300003")
- @Log("鏇存柊浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
+ @Log("鏇存柊浜у搧娴嬭瘯妫�鏌ラ」鐩俊鎭�")
public BaseResponse<Boolean> update(@RequestBody @Valid PltProductTestInspectionItems item){
int count = sv.update(item);
if (count <= 0) {
@@ -66,13 +66,13 @@
}
/**
- * 鍒犻櫎浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�
+ * 鍒犻櫎浜у搧娴嬭瘯妫�鏌ラ」鐩俊鎭�
* @param id
* @return
*/
@GetMapping(path="delete")
@SsoPowerAop(power = "10300003")
- @Log("鍒犻櫎浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
+ @Log("鍒犻櫎浜у搧娴嬭瘯妫�鏌ラ」鐩俊鎭�")
public BaseResponse<Boolean> delete(String id){
int count = sv.delete(Long.parseLong(id));
@@ -86,25 +86,25 @@
/**
- * 鏍规嵁ID鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�
+ * 鏍规嵁ID鏌ヨ浜у搧娴嬭瘯妫�鏌ラ」鐩俊鎭�
* @return
*/
@GetMapping(path="one")
@SsoPowerAop(power = "10300002") //鐧诲綍涓庢潈闄愬悓鏃堕獙璇�
- @Log("鏍规嵁ID鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
+ @Log("鏍规嵁ID鏌ヨ浜у搧娴嬭瘯妫�鏌ラ」鐩俊鎭�")
public BaseResponse<PltProductTestInspectionItems> one(String id){
PltProductTestInspectionItems item=sv.selectById(id);
return BaseResponseUtils.buildSuccess(JSON.toJSON(item));
}
/**
- * 鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�
+ * 鏌ヨ浜у搧娴嬭瘯妫�鏌ラ」鐩俊鎭�
* @param vo
* @return
*/
@PostMapping(path="some")
@SsoPowerAop(power = "10300002")
- @Log("鏌ヨ浜у搧鍝佽川妫�鏌ラ」鐩俊鎭�")
+ @Log("鏌ヨ浜у搧娴嬭瘯妫�鏌ラ」鐩俊鎭�")
public BaseResponse<QueryResultVo<List<PltProductTestInspectionItems>>> some(@RequestBody QueryVo vo){
QueryResultVo<List<PltProductTestInspectionItems>> list = sv.selectSome(vo) ;
return BaseResponseUtils.buildSuccess(list);
@@ -116,8 +116,8 @@
*/
@PostMapping(path="disabled")
@SsoPowerAop(power = "10100011")
- @Log("绂佺敤鎴栧惎鐢ㄨ川妫�椤圭洰")
- public BaseResponse<Boolean> disabled(@RequestBody PltProductUnqualifiedReason reason){
+ @Log("绂佺敤鎴栧惎鐢ㄦ祴璇曢」鐩�")
+ public BaseResponse<Boolean> disabled(@RequestBody PltProductTestInspectionItems reason){
int count = sv.disabled(reason.id,reason.disabled);
if (count <= 0) {
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
index 5bfd573..4991de4 100644
--- a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderCtrl.java
@@ -2,10 +2,13 @@
import com.dy.common.webUtil.BaseResponse;
import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
+import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
/**
* 鐢熶骇浠诲姟璁ら鎺у埗鍣�
@@ -14,6 +17,38 @@
@RestController
@RequestMapping(path = "workOrder")
public class WorkOrderCtrl {
+ private WorkOrderSv sv;
+ @Autowired
+ public void setWorkOrderSv(WorkOrderSv workOrderSv) {
+ this.sv = workOrderSv;
+ }
+ /**
+ * 鏌ヨ宸ョ珯鏄惁宸茬粡琚崰鐢�
+ * @param
+ * @return
+ */
+ @GetMapping(path="isStationUsed")
+ public BaseResponse<Boolean> isStationUsed(StaAssemblyWorkLast last){
+ String message = sv.isStationUsed(last);
+ if ("".equals(message)) {
+ return BaseResponseUtils.buildSuccess(true);
+ } else {
+ return BaseResponseUtils.buildFail(message);
+ }
+ }
+ /**
+ * 鏌ヨ鍏ㄩ儴鎵ц涓殑缁勮浠诲姟娓呭崟
+ * @param
+ * @return
+ */
+ @GetMapping(path="planList")
+ public BaseResponse<List<PrAssemblyPlan>> selectOnLineList(){
+ PrAssemblyPlan params = new PrAssemblyPlan();
+ params.setStatus(1);
+ List<PrAssemblyPlan> list = sv.selectList(params);
+ return BaseResponseUtils.buildSuccess(list);
+ }
+
@GetMapping(path = "test")
public BaseResponse test() {
diff --git a/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
new file mode 100644
index 0000000..da4baf5
--- /dev/null
+++ b/pms-parent/pms-web-station/src/main/java/com/dy/pmsStation/workOrder/WorkOrderSv.java
@@ -0,0 +1,58 @@
+package com.dy.pmsStation.workOrder;
+
+import com.alibaba.excel.util.StringUtils;
+import com.dy.common.webUtil.BaseResponseUtils;
+import com.dy.pmsGlobal.daoPr.PrAssemblyPlanMapper;
+import com.dy.pmsGlobal.pojoPr.PrAssemblyPlan;
+import com.dy.pmsGlobal.pojoSta.StaAssemblyWorkLast;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Slf4j
+@Service
+public class WorkOrderSv {
+ private PrAssemblyPlanMapper assemblyDao;
+ @Autowired
+ public void setAssemblyDao(PrAssemblyPlanMapper assemblyDao) {
+ this.assemblyDao = assemblyDao;
+ }
+
+ public String isStationUsed(StaAssemblyWorkLast last){
+ String stationId = "";
+ String userId = "";
+ //鍒ゆ柇鍝釜鏄汉鍛�, 鍝釜鏄伐绔欎俊鎭�
+ /* if(last.getStationId() != null && last.getStationId().toString().startsWith("103")){
+
+ }
+ if(last.getUserId() != null && last.getStationId().toString().startsWith("103")){
+
+ }
+ PrAssemblyPlan params = new PrAssemblyPlan();
+ params.setStatus(1);
+ List<PrAssemblyPlan> list = sv.selectList(params);
+ return BaseResponseUtils.buildSuccess(list);
+
+
+ log.info("鑾峰彇宸ョ珯缂栧彿");
+ String maxCode = dao.selectMaxCode();
+ if (StringUtils.isBlank(maxCode)) {
+ return DEFAULT_CODE;
+ } else {
+ int nextCode = Integer.parseInt(maxCode) + 1;
+ // 妫�鏌ユ孩鍑�
+ if (nextCode > 9999) {
+ throw new RuntimeException("宸ョ珯缂栧彿婧㈠嚭");
+ }
+ return String.format(CODE_FORMAT, nextCode);
+ }*/
+ return "OK";
+ }
+
+ public List<PrAssemblyPlan> selectList(PrAssemblyPlan params){
+ List<PrAssemblyPlan> planList = assemblyDao.selectList(params);
+ return planList;
+ }
+}
--
Gitblit v1.8.0