日期格式化

base-buildpackage/src/main/java/com/hzya/frame/plugin/oa/praybill/service/impl/RequisitionOrderPluginServiceImpl.java

@@ -189,7 +189,7 @@ public class RequisitionOrderPluginServiceImpl implements IRequisitionOrderPlugi
         praybill.put("pk_org", formmainData.getString("field0027"));//库存组织
         praybill.put("pk_org_v", formmainData.getString("field0051"));//库存组织v
         //praybill.put("vbillcode",formmainData.getString("field0001"));//请购单号
-        praybill.put("dbilldate", formmainData.getString("field0004"));//请购日期
+        praybill.put("dbilldate", formatDate(formmainData.getString("field0004")));//请购日期
         boolean bsctype  = false;
         if ("1".equals(formmainData.getString("field0009"))){
             bsctype = true;
@@ -202,7 +202,7 @@ public class RequisitionOrderPluginServiceImpl implements IRequisitionOrderPlugi
         praybill.put("fbillstatus", headers.getString("fbillstatus"));//单据状态
         praybill.put("bdirecttransit",false);//zhiyun
         praybill.put("billmaker", headers.getString("billmaker"));//制单人 yonyou99
-        praybill.put("dmakedate", formmainData.getString("field0004"));//制单日期
+        praybill.put("dmakedate", praybill.getString("dbilldate"));//制单日期
         praybill.put("ctrantypeid", formmainData.getString("field0039"));//请购类型
         praybill.put("bislatest", true);//最新版本
         praybill.put("vdef1", formmainData.getString("field0037"));
@@ -210,7 +210,6 @@ public class RequisitionOrderPluginServiceImpl implements IRequisitionOrderPlugi
         praybill.put("fpraysource", headers.getString("fpraysource"));//
         praybill.put("ccurrencyid", headers.getString("ccurrencyid"));//
         praybill.put("nversion", headers.getString("nversion"));//
-        praybill.put("nversion", headers.getString("nversion"));//
         List<JSONObject> parybillList = new LinkedList<>();
         paramObj.put("body",parybillList);
         String pk_org = formmainData.getString("field0027");
@@ -231,16 +230,18 @@ public class RequisitionOrderPluginServiceImpl implements IRequisitionOrderPlugi
             praybillB.put("castunitid",forson.getString("field0055"));//计量单位pk
             praybillB.put("cunitid",forson.getString("field0055"));//计量单位pk
             praybillB.put("nastnum",nnum);//数量
-            praybillB.put("dreqdate",forson.getString("field0021"));//需求日期
+            praybillB.put("dreqdate",formatDate(forson.getString("field0021")));//需求日期
-            praybillB.put("dsuggestdate",forson.getString("field0022"));//建议订货日期
+            praybillB.put("dsuggestdate",formatDate(forson.getString("field0022")));//建议订货日期
             praybillB.put("pk_purchaseorg",pk_org);//采购组织
             praybillB.put("pk_purchaseorg_v",pk_org_v);//采购组织 带版本的那个
-            praybillB.put("pk_suggestsupplier",forson.getString("field0056"));//建议供应商
+            //建议供应商不传了，张文康确认的，传过去生成订单的时候会自动分单
-            praybillB.put("pk_suggestsupplier_v",forson.getString("field0056"));//建议供应商
+            //praybillB.put("pk_suggestsupplier",forson.getString("field0056"));//建议供应商
+            //praybillB.put("pk_suggestsupplier_v",forson.getString("field0056"));//建议供应商
             praybillB.put("pk_reqstoorg",pk_org);
             praybillB.put("pk_reqstoorg_v",pk_org_v);
             praybillB.put("pk_group", formmainData.getString("field0058"));
             praybillB.put("browclose","N");//行关闭
+            praybillB.put("vbmemo",forson.getString("field0066"));//备注
             praybillB.put("vbdef1",forson.getString("field0032"));//现存量
             praybillB.put("vbdef2",forson.getString("field0033"));//在途量
             praybillB.put("vbdef3",forson.getString("field0035"));//月度消耗
@@ -253,11 +254,21 @@ public class RequisitionOrderPluginServiceImpl implements IRequisitionOrderPlugi
         return reqParams;
     }
 
+    private static String formatDate(String dateStr){
+        if (StrUtil.isNotEmpty(dateStr)){
+            return DateUtil.format(DateUtil.parseDate(dateStr), "yyyy-MM-dd HH:mm:ss");
+        }
+        return null;
+    }
     public static void main(String[] args) {
         String field0020 = null;
         String field0040 = "22";
         String s = StrUtil.isNotEmpty(field0040) ? field0040 : field0020;
         System.out.println(s);
+
+        String date = "2025-06-22";
+        String format = DateUtil.format(DateUtil.parseDate(date), "yyyy-MM-dd HH:mm:ss");
+        System.out.println(format);
     }
     //保存日志
     public void saveLog(String integration_task_living_details_id, Boolean flag, IntegrationTaskLivingDetailsEntity taskLivingDetail){