补料单明细增加操作

src/main/java/com/uas/eis/entity/ProdInOutMakeGiveDetail.java

@@ -22,6 +22,8 @@ public class ProdInOutMakeGiveDetail {
     private Integer pd_id;
     @JSONField(name = "prodId")
     private Integer pd_orderdetno;
+    @JSONField(name="actionId")
+    private Integer flag;
 
     public String getPd_prodcode() {
         return pd_prodcode;
@@ -54,4 +56,12 @@ public class ProdInOutMakeGiveDetail {
     public void setPd_orderdetno(Integer pd_orderdetno) {
         this.pd_orderdetno = pd_orderdetno;
     }
+
+    public Integer getFlag() {
+        return flag;
+    }
+
+    public void setFlag(Integer flag) {
+        this.flag = flag;
+    }
 }

src/main/java/com/uas/eis/service/Impl/ERPServiceImpl.java

@@ -166,7 +166,7 @@ public class ERPServiceImpl implements ERPService {
             if (count>0) {
                 ProdInOutMakeGive prodInOutMakeGive = baseDao.getJdbcTemplate().queryForObject("select '" + mesUser + "' mesUser,'" + mesPwd + "' mesPwd,(select wm_concat(distinct pd_ordercode) from prodiodetail where pd_piid=pi_id) maCodes,pi_inoutno,pi_id,(select wm_concat(distinct cd_varchar50_1) from customtable left join customtabledetail on cd_ctid=ct_id where ct_caller='MESWarehouse' and cd_varchar50_3=pi_whcode) pi_whcode,pi_departmentname,pi_recordman,pi_remark," + flag + " flag from prodinout where pi_id=?",
                         new BeanPropertyRowMapper<ProdInOutMakeGive>(ProdInOutMakeGive.class), piId);
-                List<ProdInOutMakeGiveDetail> prodInOutMakeGiveDetails = baseDao.query("select pd_prodcode,pd_outqty,pd_id,pd_orderdetno from prodiodetail where pd_piid=" + piId, ProdInOutMakeGiveDetail.class);
+                List<ProdInOutMakeGiveDetail> prodInOutMakeGiveDetails = baseDao.query("select pd_prodcode,pd_outqty,pd_id,pd_orderdetno," + flag + " flag from prodiodetail where pd_piid=" + piId, ProdInOutMakeGiveDetail.class);
                 prodInOutMakeGive.setDetail(prodInOutMakeGiveDetails);
                 Map<String, Object> map = jsonArray(JSON.toJSONString(prodInOutMakeGive, SerializerFeature.WriteMapNullValue).replace("null", "\"\""), tokenConfig.get("syncInOutMakeGive"));
                 hashMap.put("code", -1);