weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加退货图片;出库单编辑报错;

Browse Source
This commit is contained in:
王奎兴
2026-06-01 13:47:00 +08:00
parent 894c6f2f87
commit 394f392c67
14 changed files with 177 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd_wms/src/main/java/com/mhd/wms/domain/materialInventory/repository/mapper/MaterialInventoryMapper.java
+3
View File
@@ -1,6 +1,7 @@
package com.mhd.wms.domain.materialInventory.repository.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.mhd.wms.domain.inventoryAdjustmentRecord.entity.InventoryAdjustmentRecord;
import com.mhd.wms.domain.materialInventory.entity.MaterialInventory;
import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryPO;
import com.mhd.wms.domain.materialInventory.repository.po.MaterialInventoryQueryListPO;
@@ -103,4 +104,6 @@ public interface MaterialInventoryMapper extends BaseMapper<MaterialInventory>
* @return 库存信息
*/
MaterialInventoryPO selectByIdWithBatchAttributes(@Param("materialInventoryId") Long materialInventoryId);
public void insertReservationInventoryAdjustmentRecord(com.mhd.wms.domain.inventoryAdjustmentRecord.entity.InventoryAdjustmentRecord inventoryAdjustmentRecord);
}
mhd_wms/src/main/java/com/mhd/wms/domain/shiftManage/service/ShiftManageDomainService.java
+22 -1
View File
@@ -9,6 +9,8 @@ import com.mhd.common.core.exception.ServiceException;
import com.mhd.common.core.utils.OrderSequence;
import com.mhd.common.core.utils.bean.BeanUtils;
import com.mhd.common.security.utils.SecurityUtils;
import com.mhd.system.api.OmsServiceFeign;
import com.mhd.system.api.domain.MaterialInventoryOmsParamDO;
import com.mhd.system.api.domain.cache.AssociationWarehouseCacheDO;
import com.mhd.system.api.domain.cache.SystemServiceCacheUtil;
import com.mhd.system.api.model.LoginUser;
@@ -77,6 +79,8 @@ public class ShiftManageDomainService {
private IDeliveTaskService deliveTaskService;
@Autowired
private SystemServiceFeign systemServiceFeign;
@Autowired
private OmsServiceFeign omsServiceFeign;
/**
@@ -787,6 +791,23 @@ public class ShiftManageDomainService {
materialInventoryDOOld.setVolume(shiftMaterialDetailPO.getVolume());
materialInventoryDOOld.setArea(shiftMaterialDetailPO.getArea());
materialInventoryOldList.add(materialInventoryDOOld);
//同步oms
// MaterialInventoryOmsParamDO materialInventoryOmsParamDO = new MaterialInventoryOmsParamDO();
// materialInventoryOmsParamDO.setLotNumber(materialInventoryOldDb.getLotNumber());
// materialInventoryOmsParamDO.setWarehouseId(materialInventoryOldDb.getWarehouseId());
// materialInventoryOmsParamDO.setMaterialBaseInfoId(materialInventoryOldDb.getMaterialBaseInfoId());
// materialInventoryOmsParamDO.setBatchNumber(materialInventoryOldDb.getBatchNumber());
// materialInventoryOmsParamDO.setInOrderNumber(materialInventoryOldDb.getInOrderNumber());
// materialInventoryOmsParamDO.setType("6");
//
// materialInventoryOmsParamDO.setQuantity(shiftQuantity);
// materialInventoryOmsParamDO.setNetWeight(shiftMaterialDetailPO.getNetWeight());
// materialInventoryOmsParamDO.setGrossWeight(shiftMaterialDetailPO.getGrossWeight());
// materialInventoryOmsParamDO.setVolume(shiftMaterialDetailPO.getVolume());
// materialInventoryOmsParamDO.setArea(shiftMaterialDetailPO.getArea());
//
// omsServiceFeign.omsEdit(materialInventoryOmsParamDO);
}
//目标库位 需要增加的库存
@@ -1052,4 +1073,4 @@ public class ShiftManageDomainService {
}
return d;
}
}
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/entity/StockInOrder.java
+3
View File
@@ -365,4 +365,7 @@ public class StockInOrder extends BaseVOEntity {
@ApiModelProperty("oms入库单id")
@Excel(name = "oms入库单id")
private String omsStockInOrderId;
@ApiModelProperty("附件url")
@Excel(name = "附件url")
private String pictureUrl;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/po/StockInOrderPO.java
+3
View File
@@ -425,5 +425,8 @@ public class StockInOrderPO extends BaseVOEntity {
@ApiModelProperty("oms入库单id")
@Excel(name = "oms入库单id")
private String omsStockInOrderId;
@ApiModelProperty("附件url")
@Excel(name = "附件url")
private String pictureUrl;
}
mhd_wms/src/main/java/com/mhd/wms/domain/stockInOrder/repository/todo/StockInOrderDO.java
+3
View File
@@ -394,4 +394,7 @@ public class StockInOrderDO extends BaseVOEntity {
@ApiModelProperty("oms入库单id")
@Excel(name = "oms入库单id")
private String omsStockInOrderId;
@ApiModelProperty("附件url")
@Excel(name = "附件url")
private String pictureUrl;
}
mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/stockInOrder/StockInOrderDTO.java
+3
View File
@@ -392,4 +392,7 @@ public class StockInOrderDTO extends StockInOrderBaseDTO {
@ApiModelProperty("oms入库单id")
@Excel(name = "oms入库单id")
private String omsStockInOrderId;
@ApiModelProperty("附件url")
@Excel(name = "附件url")
private String pictureUrl;
}