|
@@ -28,6 +28,7 @@ import com.ruoyi.common.exception.ServiceException;
|
|
|
import com.ruoyi.common.utils.SecurityUtils;
|
|
|
import com.ruoyi.common.utils.wrapper.IWrapper;
|
|
|
import com.ruoyi.system.service.ISysDeptService;
|
|
|
+import com.ruoyi.system.utils.UserUtil;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -124,6 +125,10 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
|
|
|
item.setProductType(productInfo.getType());
|
|
|
item.setProductSpec(productInfo.getSpec());
|
|
|
item.setProductDefinition(productInfo.getDefinition());
|
|
|
+
|
|
|
+ item.setProductNetWeight(productInfo.getNetWeight());
|
|
|
+ item.setProductFrontalTexture(productInfo.getFrontalTexture());
|
|
|
+ item.setProductReverseTexture(productInfo.getReverseTexture());
|
|
|
});
|
|
|
|
|
|
|
|
@@ -148,6 +153,16 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
|
|
|
for (StockWaitVo record : records) {
|
|
|
record.setCompanyName(companyMap.get(record.getCompanyId()));
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ UserUtil.assignmentNickName(records, StockWaitVo::getPurchaseUserId, StockWaitVo::setPurchaseUserName);
|
|
|
+
|
|
|
+ warehouseService.attributeAssign(records, StockWaitVo::getWarehouseId, (item, warehouse) -> {
|
|
|
+ item.setWarehouseName(warehouse.getName());
|
|
|
+ });
|
|
|
+
|
|
|
+ UserUtil.assignmentNickName(records, StockWaitVo::getInOutUserId, StockWaitVo::setInOutUserName);
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -204,6 +219,8 @@ public class StockWaitServiceImpl extends ServiceImpl<StockWaitMapper, StockWait
|
|
|
stockJournal.setCompanyId(companyId);
|
|
|
stockJournal.setContractId(stockWait.getContractId());
|
|
|
stockJournal.setPurchaseId(stockWait.getPurchaseId());
|
|
|
+
|
|
|
+ stockJournal.setInOutTime(stockWaitDto.getInOutTime());
|
|
|
|
|
|
stockJournalService.save(stockJournal);
|
|
|
|