|
@@ -684,15 +684,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
if(resultId != null){
|
|
if(resultId != null){
|
|
int orderIds = DataChange.dataToBigDecimal(oneMap.get("orderIds")).intValue();
|
|
int orderIds = DataChange.dataToBigDecimal(oneMap.get("orderIds")).intValue();
|
|
try {
|
|
try {
|
|
- new Thread( new Runnable() {
|
|
|
|
- public void run(){
|
|
|
|
- try {
|
|
|
|
- omsFeign.closeInwardOrder(orderIds, sqe, (String) resultNetWeight);
|
|
|
|
- } catch (IOException e) {
|
|
|
|
- e.printStackTrace();
|
|
|
|
- }
|
|
|
|
- }
|
|
|
|
- }).start();
|
|
|
|
|
|
+ omsFeign.closeInwardOrder(orderIds, sqe, (String) resultNetWeight);
|
|
} catch (Exception e) {
|
|
} catch (Exception e) {
|
|
e.printStackTrace();
|
|
e.printStackTrace();
|
|
}
|
|
}
|
|
@@ -1022,7 +1014,7 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
|
|
}
|
|
}
|
|
//判断该分录是不是在物流系统,如果不在返回true
|
|
//判断该分录是不是在物流系统,如果不在返回true
|
|
int j = tmstruckWeightResultMapper.checkOrder(map);
|
|
int j = tmstruckWeightResultMapper.checkOrder(map);
|
|
- if (j == 0) {
|
|
|
|
|
|
+ if (j > 0) {
|
|
//如果是自提,则更换规格
|
|
//如果是自提,则更换规格
|
|
BigDecimal jlSaleOrderMaterialId = tmstruckWeightResultMapper.getJlSaleOrderMaterialId(map);
|
|
BigDecimal jlSaleOrderMaterialId = tmstruckWeightResultMapper.getJlSaleOrderMaterialId(map);
|
|
BigDecimal wlSaleOrderMaterialId = tmstruckWeightResultMapper.getWlSaleOrderMaterialId(map);
|
|
BigDecimal wlSaleOrderMaterialId = tmstruckWeightResultMapper.getWlSaleOrderMaterialId(map);
|