入库优化

src/main/java/com/jeesite/modules/erp/dao/MesProductOrderDao.java

@@ -11,5 +11,6 @@ import com.jeesite.modules.erp.entity.MesProductOrder;
  */
 @MyBatisDao
 public interface MesProductOrderDao extends CrudDao<MesProductOrder> {
-	
-}
+
+    MesProductOrder findBySn(String sn,String start);
+}

src/main/java/com/jeesite/modules/erp/entity/MesProductOrder.java

@@ -21,6 +21,7 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 		@Column(name="sn", attrName="sn", label="订单编号"),
 		@Column(name="line_sn", attrName="lineSn", label="产线编号"),
 		@Column(name="nums", attrName="nums", label="生产数量", isUpdateForce=true),
+		@Column(name="now_num", attrName="nowNums", label="当前生产入库数量", isUpdateForce=true),
 		@Column(name="delivery_date", attrName="deliveryDate", label="交货日期", isUpdateForce=true),
 		@Column(name="remark", attrName="remark", label="备注"),
 		@Column(name="state", attrName="state", label="状态 0=草稿 1=下发 2=完成"),
@@ -32,11 +33,12 @@ import com.jeesite.common.mybatis.mapper.query.QueryType;
 	}, orderBy="a.update_date DESC"
 )
 public class MesProductOrder extends DataEntity<MesProductOrder> {
-	
+
 	private static final long serialVersionUID = 1L;
 	private String sn;		// 订单编号
 	private String lineSn;		// 产线编号
 	private Integer nums;		// 生产数量
+	private Integer nowNums;		// 当前生产入库数量
 	private Date deliveryDate;		// 交货日期
 	private String remark;		// 备注
 	private String state;		// 状态 0=草稿 1=下发 2=完成
@@ -44,11 +46,11 @@ public class MesProductOrder extends DataEntity<MesProductOrder> {
 	public MesProductOrder() {
 		this(null);
 	}
-	
+
 	public MesProductOrder(String id){
 		super(id);
 	}
-	
+
 	@Size(min=0, max=64, message="订单编号长度不能超过 64 个字符")
 	public String getSn() {
 		return sn;
@@ -66,7 +68,7 @@ public class MesProductOrder extends DataEntity<MesProductOrder> {
 	public void setLineSn(String lineSn) {
 		this.lineSn = lineSn;
 	}
-	
+
 	public Integer getNums() {
 		return nums;
 	}
@@ -74,7 +76,7 @@ public class MesProductOrder extends DataEntity<MesProductOrder> {
 	public void setNums(Integer nums) {
 		this.nums = nums;
 	}
-	
+
 	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	public Date getDeliveryDate() {
 		return deliveryDate;
@@ -83,7 +85,7 @@ public class MesProductOrder extends DataEntity<MesProductOrder> {
 	public void setDeliveryDate(Date deliveryDate) {
 		this.deliveryDate = deliveryDate;
 	}
-	
+
 	@Size(min=0, max=255, message="备注长度不能超过 255 个字符")
 	public String getRemark() {
 		return remark;
@@ -92,7 +94,7 @@ public class MesProductOrder extends DataEntity<MesProductOrder> {
 	public void setRemark(String remark) {
 		this.remark = remark;
 	}
-	
+
 	@Size(min=0, max=1, message="状态 0=草稿 1=下发 2=完成长度不能超过 1 个字符")
 	public String getState() {
 		return state;
@@ -101,5 +103,12 @@ public class MesProductOrder extends DataEntity<MesProductOrder> {
 	public void setState(String state) {
 		this.state = state;
 	}
-	
-}
+
+	public Integer getNowNums() {
+		return nowNums;
+	}
+
+	public void setNowNums(Integer nowNums) {
+		this.nowNums = nowNums;
+	}
+}

src/main/java/com/jeesite/modules/erp/service/MesProductOrderService.java

@@ -16,7 +16,7 @@ import com.jeesite.modules.erp.dao.MesProductOrderDao;
  */
 @Service
 public class MesProductOrderService extends CrudService<MesProductOrderDao, MesProductOrder> {
-	
+
 	/**
 	 * 获取单条数据
 	 * @param mesProductOrder
@@ -26,7 +26,7 @@ public class MesProductOrderService extends CrudService<MesProductOrderDao, MesP
 	public MesProductOrder get(MesProductOrder mesProductOrder) {
 		return super.get(mesProductOrder);
 	}
-	
+
 	/**
 	 * 查询分页数据
 	 * @param mesProductOrder 查询条件
@@ -37,7 +37,7 @@ public class MesProductOrderService extends CrudService<MesProductOrderDao, MesP
 	public Page<MesProductOrder> findPage(MesProductOrder mesProductOrder) {
 		return super.findPage(mesProductOrder);
 	}
-	
+
 	/**
 	 * 查询列表数据
 	 * @param mesProductOrder
@@ -47,7 +47,7 @@ public class MesProductOrderService extends CrudService<MesProductOrderDao, MesP
 	public List<MesProductOrder> findList(MesProductOrder mesProductOrder) {
 		return super.findList(mesProductOrder);
 	}
-	
+
 	/**
 	 * 保存数据（插入或更新）
 	 * @param mesProductOrder
@@ -57,7 +57,7 @@ public class MesProductOrderService extends CrudService<MesProductOrderDao, MesP
 	public void save(MesProductOrder mesProductOrder) {
 		super.save(mesProductOrder);
 	}
-	
+
 	/**
 	 * 更新状态
 	 * @param mesProductOrder
@@ -67,7 +67,7 @@ public class MesProductOrderService extends CrudService<MesProductOrderDao, MesP
 	public void updateStatus(MesProductOrder mesProductOrder) {
 		super.updateStatus(mesProductOrder);
 	}
-	
+
 	/**
 	 * 删除数据
 	 * @param mesProductOrder
@@ -77,5 +77,9 @@ public class MesProductOrderService extends CrudService<MesProductOrderDao, MesP
 	public void delete(MesProductOrder mesProductOrder) {
 		super.delete(mesProductOrder);
 	}
-	
-}
+	//根据订单编号查询生产订单
+	public MesProductOrder findBySn(String sn, String state) {
+		return dao.findBySn(sn,state);
+	}
+
+}

src/main/java/com/jeesite/modules/mes/api/MesInboundControllerApi.java

@@ -2,9 +2,11 @@ package com.jeesite.modules.mes.api;
 
 import com.jeesite.common.config.Global;
 import com.jeesite.modules.erp.entity.MesProductOrder;
+import com.jeesite.modules.erp.service.MesProductOrderService;
 import com.jeesite.modules.mes.entity.MesInbound;
 import com.jeesite.modules.mes.resp.CommonResp;
 import com.jeesite.modules.mes.service.MesInboundService;
+import com.jeesite.modules.mes.service.MesProductRecordService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.validation.annotation.Validated;
@@ -14,6 +16,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.transaction.Transactional;
 import java.util.List;
 
 /**
@@ -26,10 +29,15 @@ import java.util.List;
 public class MesInboundControllerApi {
     @Autowired
     MesInboundService mesInboundService;
+    @Autowired
+    MesProductRecordService mesProductRecordService;
+    @Autowired
+    MesProductOrderService mesProductOrderService;
 
     //提交入库
     @PostMapping(value = "inboundSave")
     @ResponseBody
+    @Transactional
     public CommonResp save(@Validated MesInbound mesInbound, HttpServletRequest request, HttpServletResponse response) {
 
         CommonResp<List<MesInbound>> resp = new CommonResp<>();
@@ -40,6 +48,8 @@ public class MesInboundControllerApi {
         String lineSn = request.getParameter("lineSn");//产线编号
         String remark = request.getParameter("remark");//备注
         String oprno = request.getParameter("oprno");//工位号
+        String craft = "100000";
+        String result = "OK";
 
         if (sn.isEmpty()||productOrder.isEmpty()||storageLocation.isEmpty()||lineSn.isEmpty()||oprno.isEmpty()){
             resp.setResult(Global.FALSE);
@@ -52,8 +62,30 @@ public class MesInboundControllerApi {
             resp.setMessage("该工件已入库！");
             return resp;
         }
+        //查询相应订单
+        MesProductOrder bySn = mesProductOrderService.findBySn(productOrder, "1");//1表示下发
+        if (bySn == null){
+            resp.setResult(Global.FALSE);
+            resp.setMessage("该订单已结束！");
+            return resp;
+        }
 
         mesInboundService.save(mesInbound);
+        //修改产线结果
+        mesProductRecordService.apiUpdateRecordResult(sn, oprno, craft, "", result,"",null,lineSn);
+
+//        统计订单数量
+        MesInbound  mesInbound1 = new MesInbound();
+        mesInbound1.setProductOrder(productOrder);
+        Integer count1 = Math.toIntExact(mesInboundService.findCount(mesInbound1));
+
+
+        //根据生产订单编号找到对应订单
+        bySn.setNowNums(count1);
+        if (count1>=bySn.getNums()){
+            bySn.setState("2");//将订单关闭
+        }
+        mesProductOrderService.save(bySn);//保存订单数量
         resp.setResult(Global.TRUE);
         resp.setMessage("操作成功！");
         return resp;

src/main/resources/mappings/modules/erp/MesProductOrderDao.xml

@@ -1,7 +1,7 @@
 <?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.jeesite.modules.erp.dao.MesProductOrderDao">
-	
+
 	<!-- 查询数据
 	<select id="findList" resultType="MesProductOrder">
 		SELECT ${sqlMap.column.toSql()}
@@ -11,5 +11,21 @@
 		</where>
 		ORDER BY ${sqlMap.order.toSql()}
 	</select> -->
-	
-</mapper>
+
+    <select id="findBySn" resultType="com.jeesite.modules.erp.entity.MesProductOrder">
+--         查询数据
+
+                SELECT id, sn, line_sn, nums, delivery_date, remark, state, create_by, create_date, update_by, update_date, status
+
+                FROM mes_product_order
+
+                <where>
+                    sn = #{sn}
+                </where>
+                <if test="state != null and state != ''">
+                    and state = #{state}
+                </if>
+
+            </select>
+
+</mapper>

src/main/resources/views/modules/mes/mesScreen5.html

@@ -290,7 +290,7 @@
 
 	<div class="mes4-header">
 		<img class="mes4-logo" src="${ctxStatic}/screen/imgs/ljrLogo.png" alt="logo">
-		<div class="mes4-title">半成品阶段统计大屏</div>
+		<div class="mes4-title">机加阶段统计大屏</div>
 		<div class="mes4-datetime">
 			<span class="mes4-date" id="mes4Date"></span>
 			<span class="mes4-time" id="mes4Time"></span>