|
@@ -302,7 +302,12 @@ public class PayOrderLogic {
|
|
|
workerOrderItem.setGoodsCode(partsWorkerStockBean.getGoodsId());
|
|
|
|
|
|
|
|
|
- workerOrderItem.setNormAmount(partsWorkerStockBean.getMarketPrice());
|
|
|
+ if (workerOrderItem.getRepairFlag().equals("INNER")){
|
|
|
+ workerOrderItem.setNormAmount(Convert.toBigDecimal("0"));
|
|
|
+
|
|
|
+ }else {
|
|
|
+ workerOrderItem.setNormAmount(partsWorkerStockBean.getMarketPrice());
|
|
|
+ }
|
|
|
|
|
|
workerOrderItem.setGoodsAmount(workerOrderItem.getNormAmount());
|
|
|
|
|
@@ -329,8 +334,7 @@ public class PayOrderLogic {
|
|
|
|
|
|
workerOrderItem.setWorkerAmount(workerOrderItem.getWorkerAmount().subtract(workerOrderItem.getWorkerProceAmount()));
|
|
|
|
|
|
-
|
|
|
- if (workerOrderItem.getWorkerAmount().doubleValue() < 0){
|
|
|
+ if (workerOrderItem.getWorkerAmount().doubleValue() <= 0){
|
|
|
workerOrderItem.setWorkerProceAmount(Convert.toBigDecimal("0"));
|
|
|
workerOrderItem.setWorkerAmount(Convert.toBigDecimal("0"));
|
|
|
}
|