|
@@ -143,7 +143,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
new Thread( new Runnable() {
|
|
|
public void run(){
|
|
|
try {
|
|
|
- newFileTool.newFile(mapVal.toString(),"计量物流金蝶核对");
|
|
|
+ newFileTool.newFile(mapVal.toString(),"物流金蝶订单操作");
|
|
|
} catch (IOException e) {
|
|
|
e.printStackTrace();
|
|
|
}
|
|
@@ -180,6 +180,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
Object unCloseEntryId = mapVal.get("unCloseEntryId");
|
|
|
// 关闭原因
|
|
|
Object reason = mapVal.get("reason");
|
|
|
+ //是否车皮
|
|
|
+ Object isWagon = mapVal.get("isWagon");
|
|
|
String insertUpdateRemark = null;
|
|
|
// 是否整单
|
|
|
Object wholeOrder = mapVal.get("wholeOrder");
|
|
@@ -443,6 +445,13 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
amsSaleOrder.setSaleOrderReceiveCustomer(saleOrderReceiveCustomer);
|
|
|
amsSaleOrder.setSaleAccountBalance(new BigDecimal(saleAccountBalance));
|
|
|
amsSaleOrder.setSaleCurrentOrderAmount(new BigDecimal(saleCurrentOrderAmount));
|
|
|
+ try {
|
|
|
+ if(isWagon != null && (Boolean) isWagon) {
|
|
|
+ amsSaleOrder.setSaleType(new BigDecimal(4));
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ e.printStackTrace();
|
|
|
+ }
|
|
|
if (saleHistoricalOrderAmount != null && saleHistoricalOrderAmount.length() != 0) {
|
|
|
amsSaleOrder.setSaleHistoricalOrderAmount(new BigDecimal(saleHistoricalOrderAmount));
|
|
|
}
|