|
|
@@ -22,10 +22,12 @@ import com.minpay.common.util.DateUtil;
|
|
|
import com.minpay.common.util.FilesUtil;
|
|
|
import com.minpay.db.table.mapper.ApOrderInfMapper;
|
|
|
import com.minpay.db.table.mapper.ApWarehouseDetailMapper;
|
|
|
+import com.minpay.db.table.mapper.ApWarehouseInfMapper;
|
|
|
import com.minpay.db.table.mapper.ApWarehouseReceiptMapper;
|
|
|
import com.minpay.db.table.model.ApOrderInf;
|
|
|
import com.minpay.db.table.model.ApWarehouseDetail;
|
|
|
import com.minpay.db.table.model.ApWarehouseDetailExample;
|
|
|
+import com.minpay.db.table.model.ApWarehouseInf;
|
|
|
import com.minpay.db.table.model.ApWarehouseReceipt;
|
|
|
import com.minpay.db.table.model.ApWarehouseStock;
|
|
|
import com.minpay.db.table.own.mapper.WarehouseReceiptMapper;
|
|
|
@@ -287,6 +289,13 @@ public class WarehouseReceiptManageAction implements IMINAction{
|
|
|
detailEntryTime = detailEntryTime + "000000";
|
|
|
|
|
|
List<ApWarehouseDetail> detailList = new ArrayList<>();
|
|
|
+ //获取仓库信息
|
|
|
+ ApWarehouseInf ware = Service.lookup(IMINDataBaseService.class).getMybatisMapper(ApWarehouseInfMapper.class)
|
|
|
+ .selectByPrimaryKey(wareId);
|
|
|
+ String warehouseName = "";
|
|
|
+ if(ware != null){
|
|
|
+ warehouseName = ware.getName();
|
|
|
+ }
|
|
|
//生成仓单明细
|
|
|
for(int i =0 ; i < excelDataArray.size();i++){
|
|
|
Map<String, String> map = (Map<String, String>) excelDataArray.get(i);
|
|
|
@@ -294,6 +303,7 @@ public class WarehouseReceiptManageAction implements IMINAction{
|
|
|
ApWarehouseDetail de = new ApWarehouseDetail();
|
|
|
de.setId(flowId); //流水
|
|
|
de.setWarehouseId(wareId); //仓库
|
|
|
+ de.setWarehouseName(warehouseName); //仓库名称
|
|
|
de.setType("02"); //转仓单
|
|
|
de.setWeight(map.get("receiptWeight")); //重量
|
|
|
de.setAvlWeight(map.get("receiptWeight")); //重量
|
xuefy