|
@@ -262,7 +262,7 @@ public class TmstruckEnfactoryResultServiceImpl implements ITmstruckEnfactoryRes
|
|
//发送空委托
|
|
//发送空委托
|
|
map.put("firstMC", 1); //空委托依据
|
|
map.put("firstMC", 1); //空委托依据
|
|
int checkMeasureCommission = tmstruckMeasureCommissionService.addSteelMeasureCommission(map);
|
|
int checkMeasureCommission = tmstruckMeasureCommissionService.addSteelMeasureCommission(map);
|
|
- if(checkMeasureCommission == 1){
|
|
|
|
|
|
+ if(checkMeasureCommission == 1 && DataChange.dataToBigDecimal(map.get("orderType")).intValue() == 1){
|
|
//查询是否拼装
|
|
//查询是否拼装
|
|
Map<String, Object> isSpellingMap = tmstruckEnfactoryResultMapper.getSteelIsSpelling(resultTotalId);
|
|
Map<String, Object> isSpellingMap = tmstruckEnfactoryResultMapper.getSteelIsSpelling(resultTotalId);
|
|
int isSpelling = DataChange.dataToBigDecimal(isSpellingMap.get("isSpelling")).intValue();
|
|
int isSpelling = DataChange.dataToBigDecimal(isSpellingMap.get("isSpelling")).intValue();
|