From c09ce992101f0c9eaae165389a7638566ac566a9 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期一, 19 六月 2023 22:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java
index 17c6e62..205192b 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/view/InoutSettlePR.java
@@ -137,22 +137,22 @@
private InoutSettle getNewSettle(InoutData data) {
InoutSettle inoutSettle = new InoutSettle();
inoutSettle.setId(data.getId());
- inoutSettle.setType(data.getType());
- inoutSettle.setCustomerId(data.getCustomerId());
- inoutSettle.setCustomerName(data.getCustomerName());
- inoutSettle.setFullWeight(data.getFullWeight());
- inoutSettle.setEmptyWeight(data.getEmptyWeight());
- inoutSettle.setNetWeight(data.getNetWeight());
+ // inoutSettle.setType(data.getType());
+ // inoutSettle.setCustomerId(data.getCustomerId());
+ // inoutSettle.setCustomerName(data.getCustomerName());
+ // inoutSettle.setFullWeight(data.getFullWeight());
+ // inoutSettle.setEmptyWeight(data.getEmptyWeight());
+ // inoutSettle.setNetWeight(data.getNetWeight());
inoutSettle.setSettleWeight(data.getSettleWeight());
- inoutSettle.setDeSum(data.getDeSum());
+ // inoutSettle.setDeSum(data.getDeSum());
- inoutSettle.setCompleteTime(data.getCompleteTime());
+ // inoutSettle.setCompleteTime(data.getCompleteTime());
inoutSettle.setDepotId(data.getDepotId());
inoutSettle.setDeptId(data.getDeptId());
- inoutSettle.setUserName(data.getUserName());
- inoutSettle.setPlateNum(data.getPlateNum());
- inoutSettle.setFoodLevel(data.getFoodLevel());
- inoutSettle.setFoodVariety(data.getFoodVariety());
+ // inoutSettle.setUserName(data.getUserName());
+ // inoutSettle.setPlateNum(data.getPlateNum());
+ // inoutSettle.setFoodLevel(data.getFoodLevel());
+ // inoutSettle.setFoodVariety(data.getFoodVariety());
if (data.getPrice() != null) {
inoutSettle.setPayPrice(data.getPrice());
@@ -167,9 +167,9 @@
@Expose
@Transactional
public String saveData(InoutSettle data) {
- if (null == data.getType()) {
- data.setType(InoutConstant.TYPE_IN);
- }
+// if (null == data.getType()) {
+// data.setType(InoutConstant.TYPE_IN);
+// }
hSettleService.saveOrUpdateData(data);
--
Gitblit v1.9.3