|
@@ -671,7 +671,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
//此处判断主要是针对销售订单已经存在
|
|
|
AmsSaleOrder amsSaleOrder=new AmsSaleOrder();
|
|
|
//此处判断订单状态为反审核
|
|
|
- if (closeStatus.equals("5")) {
|
|
|
+ if (closeStatus.equals("0")&&orderStatus.equals("5")) {
|
|
|
//amsSaleOrder.setSaleOrderId(saleOrderNumber);
|
|
|
// amsSaleOrder.setDeleted(new BigDecimal(1));
|
|
|
//删除销售订单以及销售订单分录(没有下游单据的)
|
|
@@ -817,8 +817,6 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
|
|
|
StringBuilder sb = new StringBuilder();
|
|
|
for (Map<String, Object> luHaoMap : materialFurnaceNumber) {
|
|
|
sb.append(luHaoMap.get("materialFurnaceNumber"));
|
|
|
- sb.append("-");
|
|
|
- sb.append(luHaoMap.get("materialNum"));
|
|
|
sb.append("/");
|
|
|
}
|
|
|
if(materialFurnaceNumber.size() > 0){
|