|
|
@@ -18,6 +18,7 @@ import org.springframework.beans.factory.annotation.Value;
|
|
|
import org.springframework.jdbc.core.JdbcTemplate;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.time.Instant;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
@@ -353,15 +354,15 @@ public class purchaseServiceImpl implements PurchaseService {
|
|
|
ydClient.operateData(YDParam.builder()
|
|
|
.appType("APP_ERBDTFS82HOVBPL3NFH0")
|
|
|
.systemToken("RRB66F91T97H1WN89QZYC47PKLZO2ZQOUMOQLP")
|
|
|
- .formUuid("FORM-70F543E10887467188485B1E8AB3FFFDJUGK")
|
|
|
+ .formUuid("FORM-073AFBCB510649978FB9B9FB5C14BAE3MZKU")
|
|
|
.formDataJson(JSON.toJSONString(UtilMap.map("selectField_lr26l3h7, textField_lus384vk, selectField_lr26l3h8, " +
|
|
|
"textField_lr26l3hf, associationFormField_lr26l3he, textField_lwg62y7o, numberField_lr26l3hq, numberField_lr26l3hr, tableField_ltxug6h1, " +
|
|
|
"employeeField_lvz29gxt, textField_lvvs6x8v, textField_lw7sg8hq, textField_lw8we1wc, departmentSelectField_lxe98xep, employeeField_lr26l3h0, " +
|
|
|
- "textField_luhs0cni, selectField_ltzi5am7, textField_lysahqau, textField_lwg62y7p",
|
|
|
+ "textField_luhs0cni, selectField_ltzi5am7, textField_lysahqau, textField_lwg62y7p, dateField_lr26l3h2",
|
|
|
cbzz[1], cbzz[0], "物耗/配件", gys[0], gysAss, UtilMap.getString(gysList.get(0),"textField_lrhgjspc"), totalCount[0], amountSum[0], sortedByName,
|
|
|
UtilMap.getString(gysList.get(0),"employeeField_lvz29gxt_id"), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM")), LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM")),
|
|
|
LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy")), UtilMap.getString(formData,"departmentSelectField_mjchgs8l_id"), UtilMap.getString(formData,"employeeField_mhdgj164_id"),
|
|
|
- UtilMap.getString(formData,"textField_mjchgs8n"),"否","Y","否")))
|
|
|
+ UtilMap.getString(formData,"textField_mjchgs8n"),"否","Y","否",LocalDate.now().atStartOfDay().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli())))
|
|
|
.build(), YDConf.FORM_OPERATION.start);
|
|
|
// }
|
|
|
} catch (Exception ex) {
|
|
|
@@ -393,25 +394,26 @@ public class purchaseServiceImpl implements PurchaseService {
|
|
|
"numberField_lyinhl6g, textField_ltxug6gu, textField_lup6gfl1, textField_lu22o9f0, " +
|
|
|
"textField_lu2gyq5g, textField_lu825bqq, addressField_m1mxxnin, textField_ltxug6gw, " +
|
|
|
"textField_lufl71pv, textField_lu825bqp, employeeField_lwa3x3uh, employeeField_lwa3x3ui, " +
|
|
|
- "employeeField_lxu7fhde, associationFormField_ltxug6gm",
|
|
|
+ "employeeField_lxu7fhde, associationFormField_ltxug6gm, textField_lvdg3vkr",
|
|
|
UtilMap.getString(i, "textField_ltxstp84"), UtilMap.getString(i, "textField_ltxstp8c"),
|
|
|
UtilMap.getString(i, "textField_ltxstp8e"), UtilMap.getString(i, "textField_ltxstp8f"),
|
|
|
UtilMap.getString(i, "textField_ltxstp8a"), UtilMap.getString(i, "numberField_ltxyjf0s"),
|
|
|
UtilMap.getString(i, "numberField_ltxyjf0s"), UtilMap.getString(i, "numberField_ltxstp8l"),
|
|
|
UtilMap.getString(i, "numberField_ltxstp8d"), UtilMap.getString(i, "numberField_lv1r2pay"),
|
|
|
UtilMap.getDouble(i,"numberField_ltxstp8l") * UtilMap.getDouble(i,"numberField_ltxyjf0s"),
|
|
|
- UtilMap.getDouble(i,"numberField_lv1r2pay") * UtilMap.getDouble(i,"numberField_ltxyjf0s"),
|
|
|
- (UtilMap.getDouble(i,"numberField_ltxstp8l") - UtilMap.getDouble(i,"numberField_lv1r2pay")) * UtilMap.getDouble(i,"numberField_ltxyjf0s"),
|
|
|
+ new BigDecimal(Double.toString(UtilMap.getDouble(i,"numberField_lv1r2pay") * UtilMap.getDouble(i,"numberField_ltxyjf0s"))),
|
|
|
+ new BigDecimal(Double.toString((UtilMap.getDouble(i,"numberField_ltxstp8l") - UtilMap.getDouble(i,"numberField_lv1r2pay")) * UtilMap.getDouble(i,"numberField_ltxyjf0s"))),
|
|
|
UtilMap.getString(i, "textField_ltxstp8n"),
|
|
|
UtilMap.getString(i, "textField_ltxstp85"), UtilMap.getString(i, "textField_ltxstp86"),
|
|
|
UtilMap.getString(i, "textField_ltxstp88"), UtilMap.getString(i, "textField_luhs4y3r"),
|
|
|
UtilMap.getString(i, "addressField_lt4209fv"), UtilMap.getString(i, "textField_ltxstp87"),
|
|
|
UtilMap.getString(i, "textField_ltxstp8b"), UtilMap.getString(i, "textField_ltxstp7y"),
|
|
|
- UtilMap.getString(i, "employeeField_lwa3x3uh"), UtilMap.getString(i, "employeeField_lwa3x3ui"),
|
|
|
- UtilMap.getString(i, "employeeField_lx03kyul"),
|
|
|
+ UtilMap.getString(i, "employeeField_lwa3x3uh_id"), UtilMap.getString(i, "employeeField_lwa3x3ui_id"),
|
|
|
+ UtilMap.getString(i, "employeeField_lx03kyul_id"),
|
|
|
Arrays.asList(UtilMap.map("appType, formUuid, formType, instanceId, title, subTitle", "APP_ERBDTFS82HOVBPL3NFH0",
|
|
|
"FORM-0E95A616B4A54BBBB42AAEEEDCC4D9206XGA","receipt", UtilMap.getString(i,"formInstanceId"),
|
|
|
- UtilMap.getString(i,"textField_ltxstp8b"), UtilMap.getString(i,"textField_ltxstp84"))));
|
|
|
+ UtilMap.getString(i,"textField_ltxstp8b"), UtilMap.getString(i,"textField_ltxstp84"))),
|
|
|
+ UtilMap.getString(i,"textField_ltxstp88") + UtilMap.getString(i,"textField_luhs4y3r"));
|
|
|
tableList.add(tableData);
|
|
|
totalCount[0] = totalCount[0] + UtilMap.getInt(i,"numberField_ltxyjf0s");
|
|
|
amountSum[0] = amountSum[0] + UtilMap.getDouble(i,"numberField_ltxstp8l") * UtilMap.getInt(i,"numberField_ltxyjf0s");
|
