From 2aea64bfec61758ef8a4cc87853d48b5e7320f2d Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期六, 13 一月 2024 16:29:10 +0800
Subject: [PATCH] 更新订单排产
---
jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml | 100 +++++++--
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java | 14
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/IBsOrderSchedulingService.java | 14
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java | 23 +-
jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js | 8
jcdm-ui/src/views/main/bs/orderScheduling/index.vue | 222 +++++++++++++++++++--
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java | 165 ++++++++++++++-
jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/mapper/BsOrderSchedulingMapper.java | 14
8 files changed, 456 insertions(+), 104 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
index 5360a14..48cd9bc 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/controller/BsOrderSchedulingController.java
@@ -25,7 +25,7 @@
* 璁㈠崟鎺掍骇Controller
*
* @author jiang
- * @date 2024-01-09
+ * @date 2024-01-13
*/
@RestController
@RequestMapping("/bs/orderScheduling")
@@ -63,10 +63,10 @@
* 鑾峰彇璁㈠崟鎺掍骇璇︾粏淇℃伅
*/
@PreAuthorize("@ss.hasPermi('bs:orderScheduling:query')")
- @GetMapping(value = "/{orderNumber}")
- public AjaxResult getInfo(@PathVariable("orderNumber") String orderNumber)
+ @GetMapping(value = "/{id}")
+ public AjaxResult getInfo(@PathVariable("id") Long id)
{
- return success(bsOrderSchedulingService.selectBsOrderSchedulingByOrderNumber(orderNumber));
+ return success(bsOrderSchedulingService.selectBsOrderSchedulingById(id));
}
/**
@@ -96,9 +96,9 @@
*/
@PreAuthorize("@ss.hasPermi('bs:orderScheduling:remove')")
@Log(title = "璁㈠崟鎺掍骇", businessType = BusinessType.DELETE)
- @DeleteMapping("/{orderNumbers}")
- public AjaxResult remove(@PathVariable String[] orderNumbers)
+ @DeleteMapping("/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids)
{
- return toAjax(bsOrderSchedulingService.deleteBsOrderSchedulingByOrderNumbers(orderNumbers));
+ return toAjax(bsOrderSchedulingService.deleteBsOrderSchedulingByIds(ids));
}
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
index 2347f53..97ed85d 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/domain/BsOrderScheduling.java
@@ -9,15 +9,18 @@
* 璁㈠崟鎺掍骇瀵硅薄 bs_order_scheduling
*
* @author jiang
- * @date 2024-01-09
+ * @date 2024-01-13
*/
public class BsOrderScheduling extends BaseEntity
{
private static final long serialVersionUID = 1L;
+ /** ID */
+ private Long id;
+
/** 璁㈠崟缂栧彿 */
@Excel(name = "璁㈠崟缂栧彿")
- private String orderNumber;
+ private String orderNo;
/** 鍙戝姩鏈哄彿 */
@Excel(name = "鍙戝姩鏈哄彿")
@@ -61,11 +64,11 @@
/** 鍚堢涓婄嚎 */
@Excel(name = "鍚堢涓婄嚎")
- private String combinedBoxLaunch;
+ private String combinedBoxTime;
/** 鎬昏涓嬬嚎 */
@Excel(name = "鎬昏涓嬬嚎")
- private String finalAssemblyOffline;
+ private String finalAssemblyTime;
/** 鎿嶄綔浜� */
@Excel(name = "鎿嶄綔浜�")
@@ -75,14 +78,55 @@
@Excel(name = "鎿嶄綔鏃堕棿")
private String operateTime;
- public void setOrderNumber(String orderNumber)
+ /** 鐘舵�� */
+ @Excel(name = "鐘舵��")
+ private String status;
+
+ /** 棰勭暀瀛楁1 */
+ @Excel(name = "棰勭暀瀛楁1")
+ private String spareField1;
+
+ /** 棰勭暀瀛楁2 */
+ @Excel(name = "棰勭暀瀛楁2")
+ private String spareField2;
+
+ /** 棰勭暀瀛楁3 */
+ @Excel(name = "棰勭暀瀛楁3")
+ private String spareField3;
+
+ /** 棰勭暀瀛楁4 */
+ @Excel(name = "棰勭暀瀛楁4")
+ private String spareField4;
+
+ /** 鍒涘缓鐢ㄦ埛 */
+ @Excel(name = "鍒涘缓鐢ㄦ埛")
+ private String createUser;
+
+ /** 鏇存敼鐢ㄦ埛 */
+ @Excel(name = "鏇存敼鐢ㄦ埛")
+ private String updateUser;
+
+ /** 澶囨敞 */
+ @Excel(name = "澶囨敞")
+ private String remarks;
+
+ public void setId(Long id)
{
- this.orderNumber = orderNumber;
+ this.id = id;
}
- public String getOrderNumber()
+ public Long getId()
{
- return orderNumber;
+ return id;
+ }
+ public void setOrderNo(String orderNo)
+ {
+ this.orderNo = orderNo;
+ }
+
+ public String getOrderNo()
+ {
+ return orderNo;
}
public void setEngineNo(String engineNo)
{
@@ -174,23 +218,23 @@
{
return report20;
}
- public void setCombinedBoxLaunch(String combinedBoxLaunch)
+ public void setCombinedBoxTime(String combinedBoxTime)
{
- this.combinedBoxLaunch = combinedBoxLaunch;
+ this.combinedBoxTime = combinedBoxTime;
}
- public String getCombinedBoxLaunch()
+ public String getCombinedBoxTime()
{
- return combinedBoxLaunch;
+ return combinedBoxTime;
}
- public void setFinalAssemblyOffline(String finalAssemblyOffline)
+ public void setFinalAssemblyTime(String finalAssemblyTime)
{
- this.finalAssemblyOffline = finalAssemblyOffline;
+ this.finalAssemblyTime = finalAssemblyTime;
}
- public String getFinalAssemblyOffline()
+ public String getFinalAssemblyTime()
{
- return finalAssemblyOffline;
+ return finalAssemblyTime;
}
public void setOperator(String operator)
{
@@ -210,11 +254,84 @@
{
return operateTime;
}
+ public void setStatus(String status)
+ {
+ this.status = status;
+ }
+
+ public String getStatus()
+ {
+ return status;
+ }
+ public void setSpareField1(String spareField1)
+ {
+ this.spareField1 = spareField1;
+ }
+
+ public String getSpareField1()
+ {
+ return spareField1;
+ }
+ public void setSpareField2(String spareField2)
+ {
+ this.spareField2 = spareField2;
+ }
+
+ public String getSpareField2()
+ {
+ return spareField2;
+ }
+ public void setSpareField3(String spareField3)
+ {
+ this.spareField3 = spareField3;
+ }
+
+ public String getSpareField3()
+ {
+ return spareField3;
+ }
+ public void setSpareField4(String spareField4)
+ {
+ this.spareField4 = spareField4;
+ }
+
+ public String getSpareField4()
+ {
+ return spareField4;
+ }
+ public void setCreateUser(String createUser)
+ {
+ this.createUser = createUser;
+ }
+
+ public String getCreateUser()
+ {
+ return createUser;
+ }
+ public void setUpdateUser(String updateUser)
+ {
+ this.updateUser = updateUser;
+ }
+
+ public String getUpdateUser()
+ {
+ return updateUser;
+ }
+ public void setRemarks(String remarks)
+ {
+ this.remarks = remarks;
+ }
+
+ public String getRemarks()
+ {
+ return remarks;
+ }
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("orderNumber", getOrderNumber())
+ .append("id", getId())
+ .append("orderNo", getOrderNo())
.append("engineNo", getEngineNo())
.append("productType", getProductType())
.append("model", getModel())
@@ -225,10 +342,20 @@
.append("whetherOrPrint", getWhetherOrPrint())
.append("report10", getReport10())
.append("report20", getReport20())
- .append("combinedBoxLaunch", getCombinedBoxLaunch())
- .append("finalAssemblyOffline", getFinalAssemblyOffline())
+ .append("combinedBoxTime", getCombinedBoxTime())
+ .append("finalAssemblyTime", getFinalAssemblyTime())
.append("operator", getOperator())
.append("operateTime", getOperateTime())
+ .append("status", getStatus())
+ .append("spareField1", getSpareField1())
+ .append("spareField2", getSpareField2())
+ .append("spareField3", getSpareField3())
+ .append("spareField4", getSpareField4())
+ .append("createUser", getCreateUser())
+ .append("createTime", getCreateTime())
+ .append("updateUser", getUpdateUser())
+ .append("updateTime", getUpdateTime())
+ .append("remarks", getRemarks())
.toString();
}
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/mapper/BsOrderSchedulingMapper.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/mapper/BsOrderSchedulingMapper.java
index 4456fa7..3c83ec0 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/mapper/BsOrderSchedulingMapper.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/mapper/BsOrderSchedulingMapper.java
@@ -7,17 +7,17 @@
* 璁㈠崟鎺掍骇Mapper鎺ュ彛
*
* @author jiang
- * @date 2024-01-09
+ * @date 2024-01-13
*/
public interface BsOrderSchedulingMapper
{
/**
* 鏌ヨ璁㈠崟鎺掍骇
*
- * @param orderNumber 璁㈠崟鎺掍骇涓婚敭
+ * @param id 璁㈠崟鎺掍骇涓婚敭
* @return 璁㈠崟鎺掍骇
*/
- public BsOrderScheduling selectBsOrderSchedulingByOrderNumber(String orderNumber);
+ public BsOrderScheduling selectBsOrderSchedulingById(Long id);
/**
* 鏌ヨ璁㈠崟鎺掍骇鍒楄〃
@@ -46,16 +46,16 @@
/**
* 鍒犻櫎璁㈠崟鎺掍骇
*
- * @param orderNumber 璁㈠崟鎺掍骇涓婚敭
+ * @param id 璁㈠崟鎺掍骇涓婚敭
* @return 缁撴灉
*/
- public int deleteBsOrderSchedulingByOrderNumber(String orderNumber);
+ public int deleteBsOrderSchedulingById(Long id);
/**
* 鎵归噺鍒犻櫎璁㈠崟鎺掍骇
*
- * @param orderNumbers 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+ * @param ids 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteBsOrderSchedulingByOrderNumbers(String[] orderNumbers);
+ public int deleteBsOrderSchedulingByIds(Long[] ids);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/IBsOrderSchedulingService.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/IBsOrderSchedulingService.java
index ad26b5f..37788ab 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/IBsOrderSchedulingService.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/IBsOrderSchedulingService.java
@@ -7,17 +7,17 @@
* 璁㈠崟鎺掍骇Service鎺ュ彛
*
* @author jiang
- * @date 2024-01-09
+ * @date 2024-01-13
*/
public interface IBsOrderSchedulingService
{
/**
* 鏌ヨ璁㈠崟鎺掍骇
*
- * @param orderNumber 璁㈠崟鎺掍骇涓婚敭
+ * @param id 璁㈠崟鎺掍骇涓婚敭
* @return 璁㈠崟鎺掍骇
*/
- public BsOrderScheduling selectBsOrderSchedulingByOrderNumber(String orderNumber);
+ public BsOrderScheduling selectBsOrderSchedulingById(Long id);
/**
* 鏌ヨ璁㈠崟鎺掍骇鍒楄〃
@@ -46,16 +46,16 @@
/**
* 鎵归噺鍒犻櫎璁㈠崟鎺掍骇
*
- * @param orderNumbers 闇�瑕佸垹闄ょ殑璁㈠崟鎺掍骇涓婚敭闆嗗悎
+ * @param ids 闇�瑕佸垹闄ょ殑璁㈠崟鎺掍骇涓婚敭闆嗗悎
* @return 缁撴灉
*/
- public int deleteBsOrderSchedulingByOrderNumbers(String[] orderNumbers);
+ public int deleteBsOrderSchedulingByIds(Long[] ids);
/**
* 鍒犻櫎璁㈠崟鎺掍骇淇℃伅
*
- * @param orderNumber 璁㈠崟鎺掍骇涓婚敭
+ * @param id 璁㈠崟鎺掍骇涓婚敭
* @return 缁撴灉
*/
- public int deleteBsOrderSchedulingByOrderNumber(String orderNumber);
+ public int deleteBsOrderSchedulingById(Long id);
}
diff --git a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
index 9b7dd5c..7439a3b 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/bs/orderScheduling/service/impl/BsOrderSchedulingServiceImpl.java
@@ -1,6 +1,7 @@
package com.jcdm.main.bs.orderScheduling.service.impl;
import java.util.List;
+import com.jcdm.common.utils.DateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper;
@@ -11,7 +12,7 @@
* 璁㈠崟鎺掍骇Service涓氬姟灞傚鐞�
*
* @author jiang
- * @date 2024-01-09
+ * @date 2024-01-13
*/
@Service
public class BsOrderSchedulingServiceImpl implements IBsOrderSchedulingService
@@ -22,13 +23,13 @@
/**
* 鏌ヨ璁㈠崟鎺掍骇
*
- * @param orderNumber 璁㈠崟鎺掍骇涓婚敭
+ * @param id 璁㈠崟鎺掍骇涓婚敭
* @return 璁㈠崟鎺掍骇
*/
@Override
- public BsOrderScheduling selectBsOrderSchedulingByOrderNumber(String orderNumber)
+ public BsOrderScheduling selectBsOrderSchedulingById(Long id)
{
- return bsOrderSchedulingMapper.selectBsOrderSchedulingByOrderNumber(orderNumber);
+ return bsOrderSchedulingMapper.selectBsOrderSchedulingById(id);
}
/**
@@ -52,6 +53,7 @@
@Override
public int insertBsOrderScheduling(BsOrderScheduling bsOrderScheduling)
{
+ bsOrderScheduling.setCreateTime(DateUtils.getNowDate());
return bsOrderSchedulingMapper.insertBsOrderScheduling(bsOrderScheduling);
}
@@ -64,30 +66,31 @@
@Override
public int updateBsOrderScheduling(BsOrderScheduling bsOrderScheduling)
{
+ bsOrderScheduling.setUpdateTime(DateUtils.getNowDate());
return bsOrderSchedulingMapper.updateBsOrderScheduling(bsOrderScheduling);
}
/**
* 鎵归噺鍒犻櫎璁㈠崟鎺掍骇
*
- * @param orderNumbers 闇�瑕佸垹闄ょ殑璁㈠崟鎺掍骇涓婚敭
+ * @param ids 闇�瑕佸垹闄ょ殑璁㈠崟鎺掍骇涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteBsOrderSchedulingByOrderNumbers(String[] orderNumbers)
+ public int deleteBsOrderSchedulingByIds(Long[] ids)
{
- return bsOrderSchedulingMapper.deleteBsOrderSchedulingByOrderNumbers(orderNumbers);
+ return bsOrderSchedulingMapper.deleteBsOrderSchedulingByIds(ids);
}
/**
* 鍒犻櫎璁㈠崟鎺掍骇淇℃伅
*
- * @param orderNumber 璁㈠崟鎺掍骇涓婚敭
+ * @param id 璁㈠崟鎺掍骇涓婚敭
* @return 缁撴灉
*/
@Override
- public int deleteBsOrderSchedulingByOrderNumber(String orderNumber)
+ public int deleteBsOrderSchedulingById(Long id)
{
- return bsOrderSchedulingMapper.deleteBsOrderSchedulingByOrderNumber(orderNumber);
+ return bsOrderSchedulingMapper.deleteBsOrderSchedulingById(id);
}
}
diff --git a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
index 2dd716d..f906af9 100644
--- a/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
+++ b/jcdm-main/src/main/resources/mapper/bs/orderScheduling/BsOrderSchedulingMapper.xml
@@ -5,7 +5,8 @@
<mapper namespace="com.jcdm.main.bs.orderScheduling.mapper.BsOrderSchedulingMapper">
<resultMap type="BsOrderScheduling" id="BsOrderSchedulingResult">
- <result property="orderNumber" column="order_number" />
+ <result property="id" column="id" />
+ <result property="orderNo" column="order_no" />
<result property="engineNo" column="engine_no" />
<result property="productType" column="product_type" />
<result property="model" column="model" />
@@ -16,20 +17,30 @@
<result property="whetherOrPrint" column="whether_or_print" />
<result property="report10" column="report_10" />
<result property="report20" column="report_20" />
- <result property="combinedBoxLaunch" column="combined_box_launch" />
- <result property="finalAssemblyOffline" column="final_assembly_offline" />
+ <result property="combinedBoxTime" column="combined_box_time" />
+ <result property="finalAssemblyTime" column="final_assembly_time" />
<result property="operator" column="operator" />
<result property="operateTime" column="operate_time" />
+ <result property="status" column="status" />
+ <result property="spareField1" column="spare_field_1" />
+ <result property="spareField2" column="spare_field_2" />
+ <result property="spareField3" column="spare_field_3" />
+ <result property="spareField4" column="spare_field_4" />
+ <result property="createUser" column="create_user" />
+ <result property="createTime" column="create_time" />
+ <result property="updateUser" column="update_user" />
+ <result property="updateTime" column="update_time" />
+ <result property="remarks" column="remarks" />
</resultMap>
<sql id="selectBsOrderSchedulingVo">
- select order_number, engine_no, product_type, model, production_status, working_hours, current_workstation, quality_status, whether_or_print, report_10, report_20, combined_box_launch, final_assembly_offline, operator, operate_time from bs_order_scheduling
+ select id, order_no, engine_no, product_type, model, production_status, working_hours, current_workstation, quality_status, whether_or_print, report_10, report_20, combined_box_time, final_assembly_time, operator, operate_time, status, spare_field_1, spare_field_2, spare_field_3, spare_field_4, create_user, create_time, update_user, update_time, remarks from bs_order_scheduling
</sql>
<select id="selectBsOrderSchedulingList" parameterType="BsOrderScheduling" resultMap="BsOrderSchedulingResult">
<include refid="selectBsOrderSchedulingVo"/>
<where>
- <if test="orderNumber != null and orderNumber != ''"> and order_number = #{orderNumber}</if>
+ <if test="orderNo != null and orderNo != ''"> and order_no = #{orderNo}</if>
<if test="engineNo != null and engineNo != ''"> and engine_no = #{engineNo}</if>
<if test="productType != null and productType != ''"> and product_type = #{productType}</if>
<if test="model != null and model != ''"> and model = #{model}</if>
@@ -40,22 +51,30 @@
<if test="whetherOrPrint != null and whetherOrPrint != ''"> and whether_or_print = #{whetherOrPrint}</if>
<if test="report10 != null and report10 != ''"> and report_10 = #{report10}</if>
<if test="report20 != null and report20 != ''"> and report_20 = #{report20}</if>
- <if test="combinedBoxLaunch != null and combinedBoxLaunch != ''"> and combined_box_launch = #{combinedBoxLaunch}</if>
- <if test="finalAssemblyOffline != null and finalAssemblyOffline != ''"> and final_assembly_offline = #{finalAssemblyOffline}</if>
+ <if test="combinedBoxTime != null and combinedBoxTime != ''"> and combined_box_time = #{combinedBoxTime}</if>
+ <if test="finalAssemblyTime != null and finalAssemblyTime != ''"> and final_assembly_time = #{finalAssemblyTime}</if>
<if test="operator != null and operator != ''"> and operator = #{operator}</if>
<if test="operateTime != null and operateTime != ''"> and operate_time = #{operateTime}</if>
+ <if test="status != null and status != ''"> and status = #{status}</if>
+ <if test="spareField1 != null and spareField1 != ''"> and spare_field_1 = #{spareField1}</if>
+ <if test="spareField2 != null and spareField2 != ''"> and spare_field_2 = #{spareField2}</if>
+ <if test="spareField3 != null and spareField3 != ''"> and spare_field_3 = #{spareField3}</if>
+ <if test="spareField4 != null and spareField4 != ''"> and spare_field_4 = #{spareField4}</if>
+ <if test="createUser != null and createUser != ''"> and create_user = #{createUser}</if>
+ <if test="updateUser != null and updateUser != ''"> and update_user = #{updateUser}</if>
+ <if test="remarks != null and remarks != ''"> and remarks = #{remarks}</if>
</where>
</select>
- <select id="selectBsOrderSchedulingByOrderNumber" parameterType="String" resultMap="BsOrderSchedulingResult">
+ <select id="selectBsOrderSchedulingById" parameterType="Long" resultMap="BsOrderSchedulingResult">
<include refid="selectBsOrderSchedulingVo"/>
- where order_number = #{orderNumber}
+ where id = #{id}
</select>
- <insert id="insertBsOrderScheduling" parameterType="BsOrderScheduling">
+ <insert id="insertBsOrderScheduling" parameterType="BsOrderScheduling" useGeneratedKeys="true" keyProperty="id">
insert into bs_order_scheduling
<trim prefix="(" suffix=")" suffixOverrides=",">
- <if test="orderNumber != null">order_number,</if>
+ <if test="orderNo != null">order_no,</if>
<if test="engineNo != null">engine_no,</if>
<if test="productType != null">product_type,</if>
<if test="model != null">model,</if>
@@ -66,13 +85,23 @@
<if test="whetherOrPrint != null">whether_or_print,</if>
<if test="report10 != null">report_10,</if>
<if test="report20 != null">report_20,</if>
- <if test="combinedBoxLaunch != null">combined_box_launch,</if>
- <if test="finalAssemblyOffline != null">final_assembly_offline,</if>
+ <if test="combinedBoxTime != null">combined_box_time,</if>
+ <if test="finalAssemblyTime != null">final_assembly_time,</if>
<if test="operator != null">operator,</if>
<if test="operateTime != null">operate_time,</if>
+ <if test="status != null">status,</if>
+ <if test="spareField1 != null">spare_field_1,</if>
+ <if test="spareField2 != null">spare_field_2,</if>
+ <if test="spareField3 != null">spare_field_3,</if>
+ <if test="spareField4 != null">spare_field_4,</if>
+ <if test="createUser != null">create_user,</if>
+ <if test="createTime != null">create_time,</if>
+ <if test="updateUser != null">update_user,</if>
+ <if test="updateTime != null">update_time,</if>
+ <if test="remarks != null">remarks,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
- <if test="orderNumber != null">#{orderNumber},</if>
+ <if test="orderNo != null">#{orderNo},</if>
<if test="engineNo != null">#{engineNo},</if>
<if test="productType != null">#{productType},</if>
<if test="model != null">#{model},</if>
@@ -83,16 +112,27 @@
<if test="whetherOrPrint != null">#{whetherOrPrint},</if>
<if test="report10 != null">#{report10},</if>
<if test="report20 != null">#{report20},</if>
- <if test="combinedBoxLaunch != null">#{combinedBoxLaunch},</if>
- <if test="finalAssemblyOffline != null">#{finalAssemblyOffline},</if>
+ <if test="combinedBoxTime != null">#{combinedBoxTime},</if>
+ <if test="finalAssemblyTime != null">#{finalAssemblyTime},</if>
<if test="operator != null">#{operator},</if>
<if test="operateTime != null">#{operateTime},</if>
+ <if test="status != null">#{status},</if>
+ <if test="spareField1 != null">#{spareField1},</if>
+ <if test="spareField2 != null">#{spareField2},</if>
+ <if test="spareField3 != null">#{spareField3},</if>
+ <if test="spareField4 != null">#{spareField4},</if>
+ <if test="createUser != null">#{createUser},</if>
+ <if test="createTime != null">#{createTime},</if>
+ <if test="updateUser != null">#{updateUser},</if>
+ <if test="updateTime != null">#{updateTime},</if>
+ <if test="remarks != null">#{remarks},</if>
</trim>
</insert>
<update id="updateBsOrderScheduling" parameterType="BsOrderScheduling">
update bs_order_scheduling
<trim prefix="SET" suffixOverrides=",">
+ <if test="orderNo != null">order_no = #{orderNo},</if>
<if test="engineNo != null">engine_no = #{engineNo},</if>
<if test="productType != null">product_type = #{productType},</if>
<if test="model != null">model = #{model},</if>
@@ -103,22 +143,32 @@
<if test="whetherOrPrint != null">whether_or_print = #{whetherOrPrint},</if>
<if test="report10 != null">report_10 = #{report10},</if>
<if test="report20 != null">report_20 = #{report20},</if>
- <if test="combinedBoxLaunch != null">combined_box_launch = #{combinedBoxLaunch},</if>
- <if test="finalAssemblyOffline != null">final_assembly_offline = #{finalAssemblyOffline},</if>
+ <if test="combinedBoxTime != null">combined_box_time = #{combinedBoxTime},</if>
+ <if test="finalAssemblyTime != null">final_assembly_time = #{finalAssemblyTime},</if>
<if test="operator != null">operator = #{operator},</if>
<if test="operateTime != null">operate_time = #{operateTime},</if>
+ <if test="status != null">status = #{status},</if>
+ <if test="spareField1 != null">spare_field_1 = #{spareField1},</if>
+ <if test="spareField2 != null">spare_field_2 = #{spareField2},</if>
+ <if test="spareField3 != null">spare_field_3 = #{spareField3},</if>
+ <if test="spareField4 != null">spare_field_4 = #{spareField4},</if>
+ <if test="createUser != null">create_user = #{createUser},</if>
+ <if test="createTime != null">create_time = #{createTime},</if>
+ <if test="updateUser != null">update_user = #{updateUser},</if>
+ <if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="remarks != null">remarks = #{remarks},</if>
</trim>
- where order_number = #{orderNumber}
+ where id = #{id}
</update>
- <delete id="deleteBsOrderSchedulingByOrderNumber" parameterType="String">
- delete from bs_order_scheduling where order_number = #{orderNumber}
+ <delete id="deleteBsOrderSchedulingById" parameterType="Long">
+ delete from bs_order_scheduling where id = #{id}
</delete>
- <delete id="deleteBsOrderSchedulingByOrderNumbers" parameterType="String">
- delete from bs_order_scheduling where order_number in
- <foreach item="orderNumber" collection="array" open="(" separator="," close=")">
- #{orderNumber}
+ <delete id="deleteBsOrderSchedulingByIds" parameterType="String">
+ delete from bs_order_scheduling where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
diff --git a/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js b/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
index b2fbe62..4129e13 100644
--- a/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
+++ b/jcdm-ui/src/api/main/bs/orderScheduling/orderScheduling.js
@@ -10,9 +10,9 @@
}
// 鏌ヨ璁㈠崟鎺掍骇璇︾粏
-export function getOrderScheduling(orderNumber) {
+export function getOrderScheduling(id) {
return request({
- url: '/bs/orderScheduling/' + orderNumber,
+ url: '/bs/orderScheduling/' + id,
method: 'get'
})
}
@@ -36,9 +36,9 @@
}
// 鍒犻櫎璁㈠崟鎺掍骇
-export function delOrderScheduling(orderNumber) {
+export function delOrderScheduling(id) {
return request({
- url: '/bs/orderScheduling/' + orderNumber,
+ url: '/bs/orderScheduling/' + id,
method: 'delete'
})
}
diff --git a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
index f2bb687..596b1c2 100644
--- a/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
+++ b/jcdm-ui/src/views/main/bs/orderScheduling/index.vue
@@ -2,9 +2,9 @@
<div class="app-container">
<el-card class="box-card">
<el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="璁㈠崟缂栧彿" prop="orderNumber">
+ <el-form-item label="璁㈠崟缂栧彿" prop="orderNo">
<el-input
- v-model="queryParams.orderNumber"
+ v-model="queryParams.orderNo"
placeholder="璇疯緭鍏ヨ鍗曠紪鍙�"
clearable
@keyup.enter.native="handleQuery"
@@ -18,6 +18,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="鏈哄瀷" prop="model">
<el-input
v-model="queryParams.model"
@@ -26,6 +27,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="宸ユ椂" prop="workingHours">
<el-input
v-model="queryParams.workingHours"
@@ -42,6 +44,7 @@
@keyup.enter.native="handleQuery"
/>
</el-form-item>
+
<el-form-item label="鏄惁鎵撳嵃" prop="whetherOrPrint">
<el-input
v-model="queryParams.whetherOrPrint"
@@ -70,6 +73,63 @@
<el-input
v-model="queryParams.operator"
placeholder="璇疯緭鍏ユ搷浣滀汉"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+
+ <el-form-item label="棰勭暀瀛楁1" prop="spareField1">
+ <el-input
+ v-model="queryParams.spareField1"
+ placeholder="璇疯緭鍏ラ鐣欏瓧娈�1"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁2" prop="spareField2">
+ <el-input
+ v-model="queryParams.spareField2"
+ placeholder="璇疯緭鍏ラ鐣欏瓧娈�2"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁3" prop="spareField3">
+ <el-input
+ v-model="queryParams.spareField3"
+ placeholder="璇疯緭鍏ラ鐣欏瓧娈�3"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁4" prop="spareField4">
+ <el-input
+ v-model="queryParams.spareField4"
+ placeholder="璇疯緭鍏ラ鐣欏瓧娈�4"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
+ <el-input
+ v-model="queryParams.createUser"
+ placeholder="璇疯緭鍏ュ垱寤虹敤鎴�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
+ <el-input
+ v-model="queryParams.updateUser"
+ placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�"
+ clearable
+ @keyup.enter.native="handleQuery"
+ />
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remarks">
+ <el-input
+ v-model="queryParams.remarks"
+ placeholder="璇疯緭鍏ュ娉�"
clearable
@keyup.enter.native="handleQuery"
/>
@@ -130,42 +190,74 @@
<el-table border v-loading="loading" :data="orderSchedulingList" @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55" align="center" />
- <el-table-column label="璁㈠崟缂栧彿" align="center" prop="orderNumber">
+ <el-table-column label="ID" align="center" prop="id" />
+ <el-table-column label="璁㈠崟缂栧彿" align="center" prop="orderNo">
+
</el-table-column>
<el-table-column label="鍙戝姩鏈哄彿" align="center" prop="engineNo">
+
</el-table-column>
<el-table-column label="浜у搧绫诲瀷" align="center" prop="productType">
-<!-- <template slot-scope="scope">-->
-<!-- <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.productType"/>-->
-<!-- </template>-->
+
</el-table-column>
<el-table-column label="鏈哄瀷" align="center" prop="model">
+
</el-table-column>
<el-table-column label="鐢熶骇鐘舵��" align="center" prop="productionStatus">
+
</el-table-column>
<el-table-column label="宸ユ椂" align="center" prop="workingHours">
+
</el-table-column>
<el-table-column label="褰撳墠宸ヤ綅" align="center" prop="currentWorkstation">
+
</el-table-column>
<el-table-column label="璐ㄩ噺鐘舵��" align="center" prop="qualityStatus">
+
</el-table-column>
<el-table-column label="鏄惁鎵撳嵃" align="center" prop="whetherOrPrint">
+
</el-table-column>
<el-table-column label="10鎶ュ伐" align="center" prop="report10">
+
</el-table-column>
<el-table-column label="20鎶ュ伐" align="center" prop="report20">
</el-table-column>
- <el-table-column label="鍚堢涓婄嚎" align="center" prop="combinedBoxLaunch">
+ <el-table-column label="鍚堢涓婄嚎" align="center" prop="combinedBoxTime">
</el-table-column>
- <el-table-column label="鎬昏涓嬬嚎" align="center" prop="finalAssemblyOffline">
+ <el-table-column label="鎬昏涓嬬嚎" align="center" prop="finalAssemblyTime">
</el-table-column>
<el-table-column label="鎿嶄綔浜�" align="center" prop="operator">
</el-table-column>
<el-table-column label="鎿嶄綔鏃堕棿" align="center" prop="operateTime">
+
+ </el-table-column>
+ <el-table-column label="鐘舵��" align="center" prop="status">
+
+ </el-table-column>
+ <el-table-column label="棰勭暀瀛楁1" align="center" prop="spareField1">
+
+ </el-table-column>
+ <el-table-column label="棰勭暀瀛楁2" align="center" prop="spareField2">
+
+ </el-table-column>
+ <el-table-column label="棰勭暀瀛楁3" align="center" prop="spareField3">
+
+ </el-table-column>
+ <el-table-column label="棰勭暀瀛楁4" align="center" prop="spareField4">
+
+ </el-table-column>
+ <el-table-column label="鍒涘缓鐢ㄦ埛" align="center" prop="createUser">
+
+ </el-table-column>
+ <el-table-column label="鏇存敼鐢ㄦ埛" align="center" prop="updateUser">
+
+ </el-table-column>
+ <el-table-column label="澶囨敞" align="center" prop="remarks">
</el-table-column>
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -208,20 +300,48 @@
{{titleName}}
</span>
<el-form ref="form" :model="form" :rules="rules" label-width="80px">
- <el-form-item label="璁㈠崟缂栧彿" prop="orderNumber">
- <el-input v-model="form.orderNumber" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
+ <el-form-item label="璁㈠崟缂栧彿" prop="orderNo">
+ <el-input v-model="form.orderNo" placeholder="璇疯緭鍏ヨ鍗曠紪鍙�" />
</el-form-item>
<el-form-item label="鍙戝姩鏈哄彿" prop="engineNo">
<el-input v-model="form.engineNo" placeholder="璇疯緭鍏ュ彂鍔ㄦ満鍙�" />
</el-form-item>
+ <el-form-item label="浜у搧绫诲瀷" prop="productType">
+ <el-select v-model="form.productType" placeholder="璇烽�夋嫨浜у搧绫诲瀷">
+<!-- <el-option-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.label"-->
+<!-- :value="dict.value"-->
+<!-- ></el-option>-->
+ </el-select>
+ </el-form-item>
<el-form-item label="鏈哄瀷" prop="model">
<el-input v-model="form.model" placeholder="璇疯緭鍏ユ満鍨�" />
+ </el-form-item>
+ <el-form-item label="鐢熶骇鐘舵��" prop="productionStatus">
+ <el-radio-group v-model="form.productionStatus">
+<!-- <el-radio-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.value"-->
+<!-- >{{dict.label}}</el-radio>-->
+ </el-radio-group>
</el-form-item>
<el-form-item label="宸ユ椂" prop="workingHours">
<el-input v-model="form.workingHours" placeholder="璇疯緭鍏ュ伐鏃�" />
</el-form-item>
<el-form-item label="褰撳墠宸ヤ綅" prop="currentWorkstation">
<el-input v-model="form.currentWorkstation" placeholder="璇疯緭鍏ュ綋鍓嶅伐浣�" />
+ </el-form-item>
+ <el-form-item label="璐ㄩ噺鐘舵��" prop="qualityStatus">
+ <el-radio-group v-model="form.qualityStatus">
+<!-- <el-radio-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.value"-->
+<!-- >{{dict.label}}</el-radio>-->
+ </el-radio-group>
</el-form-item>
<el-form-item label="鏄惁鎵撳嵃" prop="whetherOrPrint">
<el-input v-model="form.whetherOrPrint" placeholder="璇疯緭鍏ユ槸鍚︽墦鍗�" />
@@ -234,6 +354,36 @@
</el-form-item>
<el-form-item label="鎿嶄綔浜�" prop="operator">
<el-input v-model="form.operator" placeholder="璇疯緭鍏ユ搷浣滀汉" />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-radio-group v-model="form.status">
+<!-- <el-radio-->
+<!-- v-for="dict in dict.type.${dictType}"-->
+<!-- :key="dict.value"-->
+<!-- :label="dict.value"-->
+<!-- >{{dict.label}}</el-radio>-->
+ </el-radio-group>
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁1" prop="spareField1">
+ <el-input v-model="form.spareField1" placeholder="璇疯緭鍏ラ鐣欏瓧娈�1" />
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁2" prop="spareField2">
+ <el-input v-model="form.spareField2" placeholder="璇疯緭鍏ラ鐣欏瓧娈�2" />
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁3" prop="spareField3">
+ <el-input v-model="form.spareField3" placeholder="璇疯緭鍏ラ鐣欏瓧娈�3" />
+ </el-form-item>
+ <el-form-item label="棰勭暀瀛楁4" prop="spareField4">
+ <el-input v-model="form.spareField4" placeholder="璇疯緭鍏ラ鐣欏瓧娈�4" />
+ </el-form-item>
+ <el-form-item label="鍒涘缓鐢ㄦ埛" prop="createUser">
+ <el-input v-model="form.createUser" placeholder="璇疯緭鍏ュ垱寤虹敤鎴�" />
+ </el-form-item>
+ <el-form-item label="鏇存敼鐢ㄦ埛" prop="updateUser">
+ <el-input v-model="form.updateUser" placeholder="璇疯緭鍏ユ洿鏀圭敤鎴�" />
+ </el-form-item>
+ <el-form-item label="澶囨敞" prop="remarks">
+ <el-input v-model="form.remarks" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-form>
<div slot="footer" class="dialog-footer">
@@ -274,7 +424,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
- orderNumber: null,
+ orderNo: null,
engineNo: null,
productType: null,
model: null,
@@ -285,15 +435,26 @@
whetherOrPrint: null,
report10: null,
report20: null,
- combinedBoxLaunch: null,
- finalAssemblyOffline: null,
+ combinedBoxTime: null,
+ finalAssemblyTime: null,
operator: null,
- operateTime: null
+ operateTime: null,
+ status: null,
+ spareField1: null,
+ spareField2: null,
+ spareField3: null,
+ spareField4: null,
+ createUser: null,
+ updateUser: null,
+ remarks: null
},
// 琛ㄥ崟鍙傛暟
form: {},
// 琛ㄥ崟鏍￠獙
rules: {
+ id: [
+ { required: true, message: "ID涓嶈兘涓虹┖", trigger: "blur" }
+ ],
}
};
},
@@ -318,7 +479,8 @@
// 琛ㄥ崟閲嶇疆
reset() {
this.form = {
- orderNumber: null,
+ id: null,
+ orderNo: null,
engineNo: null,
productType: null,
model: null,
@@ -329,10 +491,20 @@
whetherOrPrint: null,
report10: null,
report20: null,
- combinedBoxLaunch: null,
- finalAssemblyOffline: null,
+ combinedBoxTime: null,
+ finalAssemblyTime: null,
operator: null,
- operateTime: null
+ operateTime: null,
+ status: null,
+ spareField1: null,
+ spareField2: null,
+ spareField3: null,
+ spareField4: null,
+ createUser: null,
+ createTime: null,
+ updateUser: null,
+ updateTime: null,
+ remarks: null
};
this.resetForm("form");
},
@@ -348,7 +520,7 @@
},
// 澶氶�夋閫変腑鏁版嵁
handleSelectionChange(selection) {
- this.ids = selection.map(item => item.orderNumber)
+ this.ids = selection.map(item => item.id)
this.single = selection.length!==1
this.multiple = !selection.length
},
@@ -361,8 +533,8 @@
/** 淇敼鎸夐挳鎿嶄綔 */
handleUpdate(row) {
this.reset();
- const orderNumber = row.orderNumber || this.ids
- getOrderScheduling(orderNumber).then(response => {
+ const id = row.id || this.ids
+ getOrderScheduling(id).then(response => {
this.form = response.data;
this.open = true;
this.titleName = "淇敼璁㈠崟鎺掍骇";
@@ -372,7 +544,7 @@
submitForm() {
this.$refs["form"].validate(valid => {
if (valid) {
- if (this.form.orderNumber != null) {
+ if (this.form.id != null) {
updateOrderScheduling(this.form).then(response => {
this.$modal.msgSuccess("淇敼鎴愬姛");
this.open = false;
@@ -390,9 +562,9 @@
},
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
- const orderNumbers = row.orderNumber || this.ids;
- this.$modal.confirm('鏄惁纭鍒犻櫎璁㈠崟鎺掍骇缂栧彿涓�"' + orderNumbers + '"鐨勬暟鎹」锛�').then(function() {
- return delOrderScheduling(orderNumbers);
+ const ids = row.id || this.ids;
+ this.$modal.confirm('鏄惁纭鍒犻櫎璁㈠崟鎺掍骇缂栧彿涓�"' + ids + '"鐨勬暟鎹」锛�').then(function() {
+ return delOrderScheduling(ids);
}).then(() => {
this.getList();
this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
--
Gitblit v1.9.3