|
@@ -23,6 +23,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
|
|
|
|
+import java.math.BigDecimal;
|
|
|
import java.time.Instant;
|
|
import java.time.Instant;
|
|
|
import java.time.LocalDate;
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
import java.time.LocalDateTime;
|
|
@@ -1410,6 +1411,8 @@ public class HeiHuOrderServiceImpl implements HeiHuOrderService {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
|
|
+ log.info("oldList:{}",oldList.toString());
|
|
|
|
|
+ log.info("faxList:{}",faxList.toString());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// ========== 修改点8：分别处理高低毛利率的审批 ==========
|
|
// ========== 修改点8：分别处理高低毛利率的审批 ==========
|
|
@@ -1461,7 +1464,7 @@ public class HeiHuOrderServiceImpl implements HeiHuOrderService {
|
|
|
//组装数据塞到采购明细表
|
|
//组装数据塞到采购明细表
|
|
|
formdataLow.put("tableField_ml6g7k5d", tabledataLow);
|
|
formdataLow.put("tableField_ml6g7k5d", tabledataLow);
|
|
|
formdataLow.put("tableField_mmx6gata", oldList);
|
|
formdataLow.put("tableField_mmx6gata", oldList);
|
|
|
- formdataHigh.put("tableField_mnekj8oq", faxList);
|
|
|
|
|
|
|
+ formdataLow.put("tableField_mnekj8oq", faxList);
|
|
|
|
|
|
|
|
//组装数据塞到采购审批单号明细
|
|
//组装数据塞到采购审批单号明细
|
|
|
List<Map<String, String>> orderSummaryListLow = calculateOrderSummary(tabledataLow);
|
|
List<Map<String, String>> orderSummaryListLow = calculateOrderSummary(tabledataLow);
|
|
@@ -2027,11 +2030,11 @@ public class HeiHuOrderServiceImpl implements HeiHuOrderService {
|
|
|
}
|
|
}
|
|
|
private static final Map<String,String> TABLEFIELD_ENUM2 =new HashMap<>();//修改后：修改前
|
|
private static final Map<String,String> TABLEFIELD_ENUM2 =new HashMap<>();//修改后：修改前
|
|
|
static {
|
|
static {
|
|
|
- TABLEFIELD_ENUM2.put("textField_mnekj8ok","textField_ml7ch2pk");
|
|
|
|
|
- TABLEFIELD_ENUM2.put("numberField_mnekj8ol","numberField_ml862225");
|
|
|
|
|
- TABLEFIELD_ENUM2.put("numberField_mnekj8om","numberField_ml862226");
|
|
|
|
|
- TABLEFIELD_ENUM2.put("numberField_mnekj8on","numberField_ml862228");
|
|
|
|
|
- TABLEFIELD_ENUM2.put("numberField_mnekj8oo","numberField_ml86222d");
|
|
|
|
|
|
|
+ TABLEFIELD_ENUM2.put("textField_ml7ch2pk","textField_mnekj8ok");
|
|
|
|
|
+ TABLEFIELD_ENUM2.put("numberField_ml862225","numberField_mnekj8ol");
|
|
|
|
|
+ TABLEFIELD_ENUM2.put("numberField_ml862226","numberField_mnekj8om");
|
|
|
|
|
+ TABLEFIELD_ENUM2.put("numberField_ml862228","numberField_mnekj8on");
|
|
|
|
|
+ TABLEFIELD_ENUM2.put("numberField_ml86222d","numberField_mnekj8oo");
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
/**
|
|
/**
|
