|
@@ -11,6 +11,7 @@ import com.fjhx.item.service.product.ProductInfoService;
|
|
|
import com.fjhx.wms.entity.stock.dto.StockWaitDetailsDto;
|
|
|
import com.fjhx.wms.entity.stock.dto.StockWaitDetailsSelectDto;
|
|
|
import com.fjhx.wms.entity.stock.dto.StockWaitDto;
|
|
|
+import com.fjhx.wms.entity.stock.emums.JournalType;
|
|
|
import com.fjhx.wms.entity.stock.po.StockWait;
|
|
|
import com.fjhx.wms.entity.stock.po.StockWaitDetails;
|
|
|
import com.fjhx.wms.entity.stock.vo.StockWaitDetailsVo;
|
|
@@ -23,10 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import java.math.BigDecimal;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.Collections;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
|
|
@@ -169,6 +167,12 @@ public class StockWaitDetailsServiceImpl extends ServiceImpl<StockWaitDetailsMap
|
|
|
StockWait byId = stockWaitService.getById(stockWaitDto.getId());
|
|
|
if (statusFlag == stockWaitDetailsList.size()) {
|
|
|
byId.setStatus(2);//入库完成
|
|
|
+
|
|
|
+ //销售出库 修改生产订单为已出库
|
|
|
+ if (Objects.equals(JournalType.SALE_OUT, JournalType.getByDetailType(byId.getBusinessType()))) {
|
|
|
+ Long businessId = byId.getBusinessId();
|
|
|
+ baseMapper.updateOrderStatusByContractId(businessId, 10);
|
|
|
+ }
|
|
|
} else {
|
|
|
byId.setStatus(1);//部分入库
|
|
|
}
|