Merge remote-tracking branch 'origin/master'

src/main/java/com/gaotao/modules/customer/service/impl/CustomerIssueServiceImpl.java

@@ -167,10 +167,10 @@ public class CustomerIssueServiceImpl implements CustomerIssueService {
             seqNo++;
         }
 
-        List<String> ids = changeAndAddHandlingUnit(customerIssueDto);
+        //List<String> ids = changeAndAddHandlingUnit(customerIssueDto);
         transCommonRequestDto.setSubList(subList);
         List<TransDetail> out = transHeaderService.genTransAndChangeInventoryStock(transCommonRequestDto, "OUT");
-
+        List<String> ids = new ArrayList<>();
         //跟新HandlingUnit的长度和数量
         BigDecimal issueQty = BigDecimal.ZERO;
         List<HandlingUnit> handlingUnits = new ArrayList<>();
@@ -206,6 +206,9 @@ public class CustomerIssueServiceImpl implements CustomerIssueService {
             }else{
                 hu.setInStockFlag("N");
             }
+            if(BigDecimal.ZERO.compareTo(hu.getQty()) != 0){
+                ids.add(hu.getUnitId());
+            }
             handlingUnits.add(hu);
             if (material.getIssueQty() != null) {
                 issueQty = issueQty.add(material.getIssueQty());