完工入库自动过账

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

@@ -33,7 +33,7 @@ public class Product implements Serializable {
     @JSONField(name = "msdLevel")
     private String pr_msdlevel;
     @JSONField(name = "memoryCode")
-    private String pr_fhelpcode;
+    private String pr_kind3;
     @JSONField(name = "packType")
     private String pr_f_115;
     @JSONField(name = "thickness")
@@ -51,6 +51,14 @@ public class Product implements Serializable {
     @JSONField(name = "flag")
     private int flag;
 
+    public String getPr_kind3() {
+        return pr_kind3;
+    }
+
+    public void setPr_kind3(String pr_kind3) {
+        this.pr_kind3 = pr_kind3;
+    }
+
     public String getMesUser() {
         return mesUser;
     }
@@ -155,14 +163,6 @@ public class Product implements Serializable {
         this.pr_msdlevel = pr_msdlevel;
     }
 
-    public String getPr_fhelpcode() {
-        return pr_fhelpcode;
-    }
-
-    public void setPr_fhelpcode(String pr_fhelpcode) {
-        this.pr_fhelpcode = pr_fhelpcode;
-    }
-
     public String getPr_f_115() {
         return pr_f_115;
     }

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

@@ -263,16 +263,25 @@ public class MESServiceImpl implements MESService {
             String fSourceBillNo = StringUtil.nvl(jsonObject3.get("FSourceBillNo"), "");
             String fICMOBillNo = StringUtil.nvl(jsonObject3.get("FICMOBillNo"), "");
             String fEntrySelfA0248 = StringUtil.nvl(jsonObject3.get("FEntrySelfA0248"), "");
+            String fEntrySelfA0245 = StringUtil.nvl(jsonObject3.get("FEntrySelfA0245"), "");
+            String fEntrySelfA0246 = StringUtil.nvl(jsonObject3.get("FEntrySelfA0246"), "");
             sqls.add("insert into prodiodetail (pd_id,pd_piid,pd_inoutno,pd_piclass,pd_pdno,pd_ordercode,pd_prodcode," +
                     "pd_batchcode,pd_inqty,pd_nxlh,pd_purcrate,pd_notinqty,pd_orderprice,pd_ordertotal,pd_price," +
-                    "pd_total,pd_whcode,pd_whname,pd_remark,pd_prodmadedate,pd_replydate,pd_location,pd_macode) " +
-                    "values (PRODIODETAIL_SEQ.nextval,"+id+",'"+code+"','完工入库单',"+detno+",'"+fSourceBillNo+
+                    "pd_total,pd_whcode,pd_whname,pd_remark,pd_prodmadedate,pd_replydate,pd_location,pd_macode,pd_xb," +
+                    "pd_bz) values (PRODIODETAIL_SEQ.nextval,"+id+",'"+code+"','完工入库单',"+detno+",'"+fSourceBillNo+
                     "','"+map11.get("FNumber")+"','"+fBatchNo+"',"+fauxqty+",'"+fSecUnitID+"',"+fSecCoefficient+","+fSecQty+","+fAuxPlanPrice+","+fPlanAmount+","+fauxprice+"," +
                     ""+famount+",'"+warehouses[0]+"','"+warehouses[1]+"','"+fnote+"',to_date('"+fEntrySelfA0248+ "'," +
-                    "'yyyy-MM-dd HH24:mi:ss'),to_date('"+fPeriodDate+"','yyyy-MM-dd HH24:mi:ss'),'"+location+"','"+fICMOBillNo+"')");
+                    "'yyyy-MM-dd HH24:mi:ss'),to_date('"+fPeriodDate+"','yyyy-MM-dd HH24:mi:ss'),'"+location+"','"+fICMOBillNo+"','"+fEntrySelfA0246+"','"+fEntrySelfA0245+"')");
             detno++;
         }
         baseDao.execute(sqls);
+        Employee employee = baseDao.getJdbcTemplate().queryForObject("select * from employee where em_code=?",
+                new BeanPropertyRowMapper<Employee>(Employee.class), "mes");
+        String s = postProdInOut(id, "ProdInOut!Make!In", employee);
+        logger.info("完工入库单过账信息=="+s);
+        if (s!=null){
+            return ApiResponse.successRsp("0",request.getHeader("RequestId"),"完工入库单：："+code+"，过账失败，请在ERP重新过账！");
+        }
         return ApiResponse.successRsp("0",request.getHeader("RequestId"),"完工入库单："+code+"，请在ERP查看！");
     }
 

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

@@ -43,7 +43,7 @@ public class ScheduleTaskServiceImpl implements ScheduleTaskService {
     public void syncProducts() {
         SqlRowList rs = baseDao.queryForRowSet("select id from mes_product where status='W' order by id");
         while (rs.next()){
-            Product product = baseDao.getJdbcTemplate().queryForObject("select case when pr_kh_user='柏英特' or nvl(pr_kh_user,' ')=' ' then 'BYT' else nvl(cu_mescode,cu_code) end pr_kh_user,pr_code ,pr_detail ,pr_spec,nvl(pr_unit,'PCS') pr_unit,nvl(pr_cop,'BYT') pr_cop,nvl(pr_version,'0') pr_version,case when nvl(pr_kind,'')='半成品' or nvl(pr_kind,' ')='成品' then  'product' else 'raw' end pr_serial,nvl(pr_validdays,'0') pr_validdays,pr_msdlevel ,pr_fhelpcode ,pr_f_115 ,pr_f_116 ,pr_f_102,pr_kind,flag,pr_statuscode,pr_status from mes_product left join customer on pr_kh_user=cu_shortname where id=?",
+            Product product = baseDao.getJdbcTemplate().queryForObject("select case when pr_kh_user='柏英特' or nvl(pr_kh_user,' ')=' ' then 'BYT' else nvl(cu_mescode,cu_code) end pr_kh_user,pr_code ,pr_detail ,pr_spec,nvl(pr_unit,'PCS') pr_unit,nvl(pr_cop,'BYT') pr_cop,nvl(pr_version,'0') pr_version,case when nvl(pr_kind,'')='半成品' or nvl(pr_kind,' ')='成品' then  'product' else 'raw' end pr_serial,nvl(pr_validdays,'0') pr_validdays,pr_msdlevel ,pr_kind3 ,pr_f_115 ,pr_f_116 ,pr_f_102,pr_kind,flag,pr_statuscode,pr_status from mes_product left join customer on pr_kh_user=cu_shortname where id=?",
                     new BeanPropertyRowMapper<Product>(Product.class), rs.getInt("id"));
             product.setMesUser(tokenConfig.get("mesUser"));
             product.setMesPwd(MD5Util.encodeByMD5(tokenConfig.get("mesPwd")));