|
|
@@ -60,7 +60,7 @@ export function transitionData(data, type) {
|
|
|
productCode: data.productCode,//产品编码
|
|
|
productName: data.productName,//产品名称
|
|
|
specifications: data.specifications,//规格
|
|
|
- requiredFormingNum: type == 1 ? data.salesOrders[0]?.requiredFormingNum : (data.formingNum + ' ' + data.unit),//要求生产数量
|
|
|
+ requiredFormingNum: type == 1 ? data.salesOrders[0]?.requiredFormingNum : (data.formingNum + ' ' +( data.unit&&data.unit||'')),//要求生产数量
|
|
|
sumOrderWeight: type == 1 ? (data.sumOrderWeight + data.weightUnit) : (data.formingWeight + ' ' + (data.newWeightUnit || data.weightUnit)),//要求生产重量
|
|
|
formedNum: data.formedNum && (data.formedNum + ' ' + data.unit),//以生产数量
|
|
|
formedWeight: data.formedWeight && (data.formedWeight + ' ' + data.weightUnit),//以生产数量
|
|
|
@@ -90,7 +90,7 @@ export function transitionUnacceptedProduct(data) {
|
|
|
unqualifiedQuantity: parseInt(data.relationJson.requiredFormingNum),
|
|
|
produceRoutingId: data.relationJson.produceRoutingId,
|
|
|
produceRoutingName: data.relationJson.produceRoutingName,
|
|
|
- produceTaskId: data.relationJson.produceVersionName,
|
|
|
+ produceTaskId: data.relationJson.produceVersionId,
|
|
|
produceTaskName: data.relationJson.produceVersionName,
|
|
|
unqualifiedReason: ''
|
|
|
}
|
|
|
@@ -106,7 +106,7 @@ export function transitionUnacceptedProduct(data) {
|
|
|
unqualifiedSourceId: data.id,
|
|
|
produceRoutingId: data.relationJson.produceRoutingId,
|
|
|
produceRoutingName: data.relationJson.produceRoutingName,
|
|
|
- produceTaskId: data.relationJson.produceVersionName,
|
|
|
+ produceTaskId: data.relationJson.produceVersionId,
|
|
|
produceTaskName: data.relationJson.produceVersionName,
|
|
|
batchNo: data.relationJson.batchNo
|
|
|
}
|