蓝云日常物耗及NC部门达成代码更新

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/FImplService.java

@@ -68,7 +68,8 @@ public class FImplService implements FService {
         for (Map data : dataList) {
             String kpgs = UtilMap.getString(data, "selectField_lvc9x4vo");  // 开票公司
             String khmc = UtilMap.getString(data, "selectField_lvdojfui");  // 客户名称
-            String unique = kpgs + "_" + khmc;
+            String xmmc = UtilMap.getString(data, "textField_lvdntzul");    // 项目名称
+            String unique = kpgs + "_" + khmc + "_" + xmmc; // 唯一标识
             Map formData = UtilMap.getMap(setMap, unique); // 累计标识
             if (!setMap.containsKey(unique)) {
                 // 主表信息: 由 --> 至, 合计金额

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/NCServiceImpl.java

@@ -288,7 +288,7 @@ public class NCServiceImpl implements NCService {
                     "  left join bd_accasoa on gl_detail.pk_accasoa=bd_accasoa.pk_accasoa\n" +
                     "  left join bd_account on bd_accasoa.pk_account=bd_account.pk_account\n" +
                     "  \n" +
-                    " where  substring(bd_account.code,0,5) in ('6602','6601')\n" +
+                    " where  substring(bd_account.code,0,5) in ('5001','5301','6602','6601','6001','6051')\n" +
                     "   and gl_detail.yearv = '"+ year +"'\n" +
                     "   and gl_detail.adjustperiod = '" + month + "'\n" +
                     "   and org_accountingbook.code in('A01-0004','A02-0004','A11-0004','A03-0004','A06-0004','A04-0004','A05-0004','A10-0004')\n" +

mjava-lanyun/src/main/java/com/malk/lanyun/service/impl/TimerServiceImpl.java

@@ -90,7 +90,7 @@ public class TimerServiceImpl implements TimerService {
         log.info("项目点数据, {}", dataList.size());
         dataList.forEach(formData -> {
 //            if("PM00411".equals(UtilMap.getString(formData, "textField_ltxrn8h1"))){
-            if(!format.equals(UtilMap.getString(formData, "textField_m9uqfoyl"))){
+            if(!format.equals(UtilMap.getString(formData, "textField_m9uqfoyl")) && !"直属队".equals(UtilMap.getString(formData,"textField_lrr3rg6i"))){
                 //获取撤场时间
                 Long withdrawalTime = formData.get("dateField_lzaqu26p")==null?null:DateUtil.beginOfMonth(DateUtil.date(Long.parseLong(formData.get("dateField_lzaqu26p").toString()))).getTime();
                 if (UtilMap.getString(formData, "selectField_lrn2oy4a").equals("进行中") || (ObjectUtil.isNotNull(withdrawalTime) && lastMonth == withdrawalTime)){
@@ -1189,10 +1189,12 @@ public class TimerServiceImpl implements TimerService {
                         if(ObjectUtil.isNotNull(businessList) && businessList.size()>0){
                             if (ObjectUtil.isNotNull(businessList.get(0).get("numberField_ltxqbvzz"))){
                                 double fax = Double.parseDouble(businessList.get(0).get("numberField_ltxqbw00").toString());//税率
+                                e.put("textField_ludokwa5",businessList.get(0).get("textField_ltxy8wyn").toString());
                                 e.put("numberField_ludq7er6",fax);
                                 Double unitPrice = Double.parseDouble(businessList.get(0).get("numberField_ltxqbvzz").toString());//供应商价目
                                 e.put("numberField_ludokwa6",unitPrice);
                                 e.put("selectField_lv4tq48o",businessList.get(0).get("selectField_ltxqfrj8") + "区 ￥" + businessList.get(0).get("numberField_ltxqbvzz") + " " + businessList.get(0).get("textField_ludp2v7i"));
+                                e.put("textField_lv3gfopt",businessList.get(0).get("selectField_ltxqfrj8") + "区 ￥" + businessList.get(0).get("numberField_ltxqbvzz") + " " + businessList.get(0).get("textField_ludp2v7i"));
                                 Double scbqr = Double.parseDouble(e.get("numberField_lvaft823") == null|| e.get("numberField_lvaft823").toString().isEmpty() ? "0.0" :e.get("numberField_lvaft823").toString());//市场部确认
                                 Double qgs = Double.parseDouble(e.get("numberField_lr383i4m") == null|| e.get("numberField_lr383i4m").toString().isEmpty() ? "0.0" :e.get("numberField_lr383i4m").toString());//请购数
                                 Double kcjyl = Double.parseDouble(e.get("numberField_lrzu5n7a") == null|| e.get("numberField_lrzu5n7a").toString().isEmpty() ? "0.0" :e.get("numberField_lrzu5n7a").toString());//库存建议量
@@ -1211,9 +1213,23 @@ public class TimerServiceImpl implements TimerService {
                                 e.put("numberField_lv1qokdj",String.format("%.2f", unitPrice/(1+fax/100)));
                                 e.put("numberField_lr383i4n",unitPrice * kcjyl);
                                 if (!ObjectUtil.isNotNull(e.get("textField_ludq7er4"))){
-                                    e.put("textField_ludq7er4","6038646631836291_"+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyyMMddHHmmssS"));
+                                    e.put("textField_ludq7er4",code + "_6038646631836291_"+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyyMMddHHmmssS"));
                                 }
                             }
+                        }else {
+                            e.put("textField_ludokwa5","");
+                            e.put("numberField_ludq7er6",0.0);
+                            e.put("numberField_ludokwa6",0.0);
+                            e.put("selectField_lv4tq48o","");
+                            e.put("textField_lv3gfopt","");
+                            e.put("numberField_lrzu5n7d",0.0);//采购单价
+                            e.put("numberField_ludokwa9",0.0);//采购金额小计
+                            e.put("numberField_lxd0y351",0.0);//实际金额小计
+                            e.put("numberField_lv1qokdj",0.0);
+                            e.put("numberField_lr383i4n",0.0);
+//                            if (!ObjectUtil.isNotNull(e.get("textField_ludq7er4"))){
+                                e.put("textField_ludq7er4","6038646631836291_"+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyyMMddHHmmssS"));
+//                            }
                         }
                     }
                 });
@@ -1234,11 +1250,13 @@ public class TimerServiceImpl implements TimerService {
                         }
                         if(ObjectUtil.isNotNull(businessList) && businessList.size()>0){
                             if (ObjectUtil.isNotNull(businessList.get(0).get("numberField_ltxqbvzz"))){
+                                e.put("textField_ludqgh1l",businessList.get(0).get("textField_ltxy8wyn").toString());
                                 double fax = Double.parseDouble(businessList.get(0).get("numberField_ltxqbw00").toString());//税率
                                 e.put("numberField_ludqgh1n",fax);
                                 Double unitPrice = Double.parseDouble(businessList.get(0).get("numberField_ltxqbvzz").toString());//供应商价目
                                 e.put("numberField_ludqgh1m",unitPrice);
                                 e.put("selectField_lv4tq48p",businessList.get(0).get("selectField_ltxqfrj8") + "区 ￥" + businessList.get(0).get("numberField_ltxqbvzz") + " " + businessList.get(0).get("textField_ludp2v7i"));
+                                e.put("textField_lv3jz5w6",businessList.get(0).get("selectField_ltxqfrj8") + "区 ￥" + businessList.get(0).get("numberField_ltxqbvzz") + " " + businessList.get(0).get("textField_ludp2v7i"));
                                 Double scbqr = Double.parseDouble(e.get("numberField_lvaft824") == null|| e.get("numberField_lvaft824").toString().isEmpty() ? "0.0" :e.get("numberField_lvaft824").toString());//市场部确认
                                 Double qgs = Double.parseDouble(e.get("numberField_ludqgh1j") == null|| e.get("numberField_ludqgh1j").toString().isEmpty() ? "0.0" :e.get("numberField_ludqgh1j").toString());//请购数
                                 Double kcjyl = Double.parseDouble(e.get("numberField_ludqgh1q") == null|| e.get("numberField_ludqgh1q").toString().isEmpty() ? "0.0" :e.get("numberField_ludqgh1q").toString());//库存建议量
@@ -1248,7 +1266,6 @@ public class TimerServiceImpl implements TimerService {
                                     e.put("numberField_ludqgh1o",String.format("%.8f", qgs * unitPrice));//实际金额小计
                                     sum[1] = sum[1] + qgs * unitPrice * 1.1;
                                     sum[3] = sum[3] + qgs * unitPrice;
-
                                 }else {
                                     e.put("numberField_ludqgh1t",String.format("%.2f", unitPrice * 1.1 * scbqr));//采购金额小计
                                     e.put("numberField_ludqgh1o",String.format("%.8f", scbqr * unitPrice));//实际金额小计
@@ -1257,9 +1274,23 @@ public class TimerServiceImpl implements TimerService {
                                 }
                                 e.put("numberField_lv1qokdk",String.format("%.2f", unitPrice/(1+fax/100)));
                                 e.put("numberField_lxd0y352",unitPrice * kcjyl);
-                                if (!ObjectUtil.isNotNull(e.get("textField_ludqgh1u"))){
-                                    e.put("textField_ludqgh1u","6038646631836291_"+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyyMMddHHmmssS"));
-                                }
+//                                if (!ObjectUtil.isNotNull(e.get("textField_ludqgh1u"))){
+                                    e.put("textField_ludqgh1u",code+ "_6038646631836291_"+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyyMMddHHmmssS"));
+//                                }
+                            }
+                        }else {
+                            e.put("textField_ludqgh1l","");
+                            e.put("numberField_ludqgh1n",0.0);
+                            e.put("numberField_ludqgh1m",0.0);
+                            e.put("selectField_lv4tq48p","");
+                            e.put("textField_lv3jz5w6","");
+                            e.put("numberField_ludqgh1s",0.0);//采购单价
+                            e.put("numberField_ludqgh1t",0.0);//采购金额小计
+                            e.put("numberField_ludqgh1o",0.0);//实际金额小计
+                            e.put("numberField_lv1qokdk",0.0);
+                            e.put("numberField_lxd0y352",0.0);
+                            if (!ObjectUtil.isNotNull(e.get("textField_ludqgh1u"))){
+                                e.put("textField_ludqgh1u","6038646631836291_"+LocalDateTimeUtil.format(LocalDateTime.now(), "yyyyMMddHHmmssS"));
                             }
                         }
                     }

mjava/src/main/java/com/malk/server/common/VenR.java

@@ -31,6 +31,7 @@ public class VenR extends BaseDto {
     public static final String RC_FXK = "com.malk.server.fxiaoke.FXKR ";
     public static final String RC_XBB = "com.malk.server.xbongbong.XBBR";
     public static final String RC_VK = "com.malk.server.vika.VKR";
+    public static final String RC_YJ = "com.malk.server.yunjian.DDR";
 
     /**
      * 通用post请求

mjava/src/main/java/com/malk/server/yunjian/DDR.java

@@ -0,0 +1,54 @@
+package com.malk.server.yunjian;
+
+import com.malk.server.common.McException;
+import com.malk.server.common.VenR;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Map;
+
+/**
+ * 返回值配置参考McR
+ */
+@Data
+@NoArgsConstructor
+public class DDR<T> extends VenR {
+
+    // 请求状态
+    private String resCode;
+
+    private String resMsg;
+
+    private T data;
+
+    /**
+     * token
+     */
+    private String accessToken;
+
+    // 成功状态标记
+    private final static String SUC_CODE = "200000";
+
+
+    /**
+     * 断言错误信息
+     */
+    @Override
+    public void assertSuccess() {
+        McException.assertException(!resCode.equals(SUC_CODE), resCode, resMsg, "yunjian");
+    }
+
+    /**
+     * 通用post请求
+     */
+    public static DDR doPost(String url, Map header, Map param, Map body) {
+        return (DDR) DDR.doPost(url, header, param, body, VenR.RC_YJ);
+    }
+
+    /**
+     * 通用get请求
+     */
+    public static DDR doGet(String url, Map header, Map param) {
+        return (DDR) DDR.doGet(url, header, param, VenR.RC_YJ);
+    }
+}