推送数据查询修改
This commit is contained in:
+28
-15
@@ -41,6 +41,7 @@ import com.mhd.wms.domain.materialMoreDetail.repository.po.MaterialMoreDetailPO;
|
|||||||
import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
|
import com.mhd.wms.domain.inMaterialDetail.repository.po.InMaterialDetailPO;
|
||||||
import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
|
import com.mhd.wms.domain.inMaterialDetail.repository.todo.InMaterialDetailDO;
|
||||||
import com.mhd.wms.domain.inMaterialDetail.service.InMaterialDetailDomainService;
|
import com.mhd.wms.domain.inMaterialDetail.service.InMaterialDetailDomainService;
|
||||||
|
import com.mhd.wms.domain.shelfMaterialDetail.entity.ShelfMaterialDetail;
|
||||||
import com.mhd.wms.domain.shelfMaterialDetail.repository.po.ShelfMaterialDetailPO;
|
import com.mhd.wms.domain.shelfMaterialDetail.repository.po.ShelfMaterialDetailPO;
|
||||||
import com.mhd.wms.domain.shelfMaterialDetail.repository.todo.ShelfMaterialDetailDO;
|
import com.mhd.wms.domain.shelfMaterialDetail.repository.todo.ShelfMaterialDetailDO;
|
||||||
import com.mhd.wms.domain.shelfMaterialDetail.service.ShelfMaterialDetailDomainService;
|
import com.mhd.wms.domain.shelfMaterialDetail.service.ShelfMaterialDetailDomainService;
|
||||||
@@ -2642,33 +2643,45 @@ public class StockShelfOrderApplicationService {
|
|||||||
for(Long id : idList){
|
for(Long id : idList){
|
||||||
|
|
||||||
StockShelfOrder stockShelfOrder = stockShelfOrderMapper.selectById(id);
|
StockShelfOrder stockShelfOrder = stockShelfOrderMapper.selectById(id);
|
||||||
// StockInOrderPO stockInOrderPO = stockInOrderMapper.selectByInOrderNumber(stockShelfOrder.getInOrderNumber());
|
|
||||||
// if(stockInOrderPO == null){
|
|
||||||
// throw new ServiceException("该订单还未入库");
|
|
||||||
// }
|
|
||||||
|
|
||||||
System.out.println(stockShelfOrder);
|
// 通过上架单号查询上架物料明细
|
||||||
String etpsPreentNo = stockShelfOrder.getInOrderNumber();//入库单号
|
ShelfMaterialDetailDO shelfDetailDO = new ShelfMaterialDetailDO();
|
||||||
//如果是上架的时候推送,name就是现在的时间 ,没有找到上架完成时间
|
shelfDetailDO.setShelfOrderNumber(stockShelfOrder.getShelfOrderNumber());
|
||||||
Date inputTime = new Date();//录入时间-现在时间
|
List<ShelfMaterialDetailPO> shelfMaterialDetails = shelfMaterialDetailDomainService.queryList(shelfDetailDO);
|
||||||
|
|
||||||
//Date inputTime = stockInOrderPO.getWarehouseDate();//录入时间-入仓时间
|
Long materialBaseInfoId = null;
|
||||||
char mtpckEndprdTypecd = 'E';
|
if (shelfMaterialDetails != null && !shelfMaterialDetails.isEmpty()) {
|
||||||
|
materialBaseInfoId = shelfMaterialDetails.get(0).getMaterialBaseInfoId();
|
||||||
|
}
|
||||||
|
|
||||||
|
String mtpckEndprdTypecd = "E";
|
||||||
|
if (materialBaseInfoId != null) {
|
||||||
|
MaterialBaseInfo materialBaseIn = materialBaseInfoMapper.selectById(materialBaseInfoId);
|
||||||
|
if (materialBaseIn != null) {
|
||||||
|
Integer goodsType = materialBaseIn.getGoodsType();
|
||||||
|
if (goodsType == 0) {
|
||||||
|
mtpckEndprdTypecd = "M";
|
||||||
|
} else if (goodsType == 2) {
|
||||||
|
mtpckEndprdTypecd = "E";
|
||||||
|
} else if (goodsType == 1) {
|
||||||
|
mtpckEndprdTypecd = "E";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
String etpsPreentNo = stockShelfOrder.getInOrderNumber();
|
||||||
|
Date inputTime = new Date();
|
||||||
|
|
||||||
Map<String, Object> item = new HashMap<>();
|
Map<String, Object> item = new HashMap<>();
|
||||||
item.put("etpsPreentNo", stockShelfOrder.getInOrderNumber());
|
item.put("etpsPreentNo", stockShelfOrder.getInOrderNumber());
|
||||||
item.put("inputTime", new Date());//或者是前段传时间 或者是加时间字段然后查询拿到这里
|
item.put("inputTime", new Date());//或者是前段传时间 或者是加时间字段然后查询拿到这里
|
||||||
item.put("mtpckEndprdTypecd", 'E');
|
item.put("mtpckEndprdTypecd", mtpckEndprdTypecd);
|
||||||
List<Map<String,Object>> bodyList = new ArrayList<>();
|
List<Map<String,Object>> bodyList = new ArrayList<>();
|
||||||
bodyList.add(item);
|
bodyList.add(item);
|
||||||
|
|
||||||
//构建推送数据
|
//构建推送数据
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
GwLogDTO gwLogDTO = new GwLogDTO();
|
GwLogDTO gwLogDTO = new GwLogDTO();
|
||||||
gwLogDTO.setType("保税仓-进口仓单");
|
gwLogDTO.setType("保税仓-进口仓单");
|
||||||
gwLogDTO.setBusinessId(id);
|
gwLogDTO.setBusinessId(id);
|
||||||
|
|||||||
Reference in New Issue
Block a user