Skip to content

孙克 / smf-core

转到一个项目
切换导航栏
切换导航栏固定状态
Commit e75cbbe0 由 张少辉
选项

1.接收momo的出库单修改

1 个父辈 ac565797
内嵌 并排
正在显示 10 个修改的文件 包含 100 行增加 和 66 行删除
src/main/java/com/neotel/smfcore/core/order/LiteOrderCache.java
...@@ -624,11 +624,6 @@ public class LiteOrderCache { ...@@ -624,11 +624,6 @@ public class LiteOrderCache {
task.setLocInfo(locInfo); task.setLocInfo(locInfo);
task.setSo(cacheOrder.getSo()); task.setSo(cacheOrder.getSo());
task.setSoltNum(orderItem.getSlotNum()); task.setSoltNum(orderItem.getSlotNum());
task.setStockoutNo(orderNo);
task.setContainer(pos.getBarcode().getPidBarcode());
task.setProductName("");
task.setStockreturnNoLine(orderItem.getStockoutNoLine());
// task = dataLogDao.save(task);
taskService.addTaskToExecute(task); taskService.addTaskToExecute(task);
} }
//如果是RI出库，只有一盘，出完就结束 //如果是RI出库，只有一盘，出完就结束
......
src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrder.java
...@@ -98,6 +98,14 @@ public class LiteOrder extends BasePo implements Serializable { ...@@ -98,6 +98,14 @@ public class LiteOrder extends BasePo implements Serializable {
*/ */
private String type; private String type;
//momo新增的接口
private String billType;
private String momoType;
private String createTime;
private String creator;
/** /**
* 订单的详细信息 * 订单的详细信息
*/ */
......
src/main/java/com/neotel/smfcore/core/order/service/po/LiteOrderItem.java
...@@ -104,15 +104,15 @@ public class LiteOrderItem extends BasePo implements Serializable ,Comparable<Li ...@@ -104,15 +104,15 @@ public class LiteOrderItem extends BasePo implements Serializable ,Comparable<Li
private String orderType = ""; private String orderType = "";
private String StockoutNoLine;
private String ProductName;
private String Equipment;
private String SubRegion;
private String StationNo;
private String PickLocation;
private List<TaskDetail> taskDetailList; private List<TaskDetail> taskDetailList;
//momo新增的字段
private String rowNumber;
private String equipment;
private String subRegion;
private String stationNo;
private String pickLocation;
/** /**
* 自定义的附加字段，key=字段名，value=值 * 自定义的附加字段，key=字段名，value=值
*/ */
......
src/main/java/com/neotel/smfcore/core/system/service/po/DataLog.java
...@@ -267,20 +267,6 @@ public class DataLog extends BasePo implements Serializable ,Comparable<DataLog> ...@@ -267,20 +267,6 @@ public class DataLog extends BasePo implements Serializable ,Comparable<DataLog>
private String currentLoc; private String currentLoc;
//退库增加的参数
private String productName;
private int qty;
private String stockreturnNoLine;
private String stockReturn;
//出库增加的参数
private String StockoutNo;
private String StockoutNoLine;
private String container;
public String getBarcode() { public String getBarcode() {
if(barcode == null){ if(barcode == null){
return ""; return "";
......
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/momo/MomoApi.java
...@@ -84,7 +84,7 @@ public class MomoApi extends BaseSmfApiListener { ...@@ -84,7 +84,7 @@ public class MomoApi extends BaseSmfApiListener {
} }
public void stockReturn(DataLog task) { public void stockReturn(DataLog task) {
Map<String, Object> paramMap = new HashMap<>(); /*Map<String, Object> paramMap = new HashMap<>();
paramMap.put("ReturnDate", DateUtil.toDateString(task.getUpdateDate(), "yyyy/MM/dd HH:mm:ss")); paramMap.put("ReturnDate", DateUtil.toDateString(task.getUpdateDate(), "yyyy/MM/dd HH:mm:ss"));
paramMap.put("StockReturn", task.getStockReturn()); paramMap.put("StockReturn", task.getStockReturn());
...@@ -116,7 +116,7 @@ public class MomoApi extends BaseSmfApiListener { ...@@ -116,7 +116,7 @@ public class MomoApi extends BaseSmfApiListener {
log.info("接口6：MOM接收WMS的退库结果,返回参数为:" + resultStr); log.info("接口6：MOM接收WMS的退库结果,返回参数为:" + resultStr);
} catch (ApiException e) { } catch (ApiException e) {
log.error("接口6：MOM接收WMS的退库结果,请求异常:", e); log.error("接口6：MOM接收WMS的退库结果,请求异常:", e);
} }*/
} }
...@@ -128,7 +128,7 @@ public class MomoApi extends BaseSmfApiListener { ...@@ -128,7 +128,7 @@ public class MomoApi extends BaseSmfApiListener {
@Override @Override
public void outTaskStatusChange(String outNotifyUrl, DataLog task) { public void outTaskStatusChange(String outNotifyUrl, DataLog task) {
if (!task.isNotifyMomo()) { if (!task.isNotifyMomo()) {
Map<String, Object> paramMap = new HashMap<>(); /*Map<String, Object> paramMap = new HashMap<>();
paramMap.put("StockoutNo", task.getStockoutNo()); paramMap.put("StockoutNo", task.getStockoutNo());
List<Map<String, Object>> DetailItems = new ArrayList<>(); List<Map<String, Object>> DetailItems = new ArrayList<>();
...@@ -154,7 +154,7 @@ public class MomoApi extends BaseSmfApiListener { ...@@ -154,7 +154,7 @@ public class MomoApi extends BaseSmfApiListener {
log.info("接口5：MOM接收WMS的出库结果,返回参数为:" + resultStr); log.info("接口5：MOM接收WMS的出库结果,返回参数为:" + resultStr);
} catch (ApiException e) { } catch (ApiException e) {
log.error("接口5：MOM接收WMS的出库结果,请求异常:", e); log.error("接口5：MOM接收WMS的出库结果,请求异常:", e);
} }*/
} }
} }
......
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/momo/bean/request/DeliveryOrder.java
package com.neotel.smfcore.custom.aiqingzhiyin1643.momo.bean.request; package com.neotel.smfcore.custom.aiqingzhiyin1643.momo.bean.request;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data; import lombok.Data;
import java.util.List; import java.util.List;
@Data @Data
public class DeliveryOrder { public class DeliveryOrder {
private List<DeliveryOrderItem> DetailItems; @JsonProperty("DeliveryOrder")
private String StockoutNo; private String deliveryOrder;
@JsonProperty("Type")
private String type;
@JsonProperty("BillType")
private String billType;
@JsonProperty("CreateTime")
private String createTime;
@JsonProperty("Creator")
private String creator;
private List<DeliveryOrderMaterial> DeliveryOrderMaterial;
} }
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/momo/bean/request/DeliveryOrderItem.java deleted 100644 → 0
package com.neotel.smfcore.custom.aiqingzhiyin1643.momo.bean.request;
import lombok.Data;
@Data
public class DeliveryOrderItem {
private String Container;
private String ProductName;
private String ProductNo;
private int QuantityOnHand;
private String StockoutNoLine;
private String Equipment;
private String SubRegion;
private String StationNo;
private String PickLocation;
}
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/momo/bean/request/DeliveryOrderMaterial.java 0 → 100644
package com.neotel.smfcore.custom.aiqingzhiyin1643.momo.bean.request;
import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Data;
@Data
public class DeliveryOrderMaterial {
@JsonProperty("MaterialCode")
private String materialCode;
// 将字符串格式的数值转为 double 类型
@JsonProperty("MaterialCodeQty")
private String materialCodeQty;
@JsonProperty("RowNumber")
private String rowNumber;
@JsonProperty("Equipment")
private String equipment;
@JsonProperty("SubRegion")
private String subRegion;
@JsonProperty("StationNo")
private String stationNo;
@JsonProperty("PickLocation")
private String pickLocation;
}
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/momo/bean/response/DeliveryOrderResponse.java 0 → 100644
package com.neotel.smfcore.custom.aiqingzhiyin1643.momo.bean.response;
import lombok.AllArgsConstructor;
import lombok.Data;
@Data
@AllArgsConstructor
public class DeliveryOrderResponse {
// 对应 JSON 中的 Content（响应内容，可为任意类型）
private Object Content;
// 对应 JSON 中的 IsSuccess（是否成功）
private boolean IsSuccess;
// 对应 JSON 中的 ErrorCode（错误码）
private String ErrorCode;
// 对应 JSON 中的 ErrorMessage（错误信息）
private String ErrorMessage;
}
src/main/java/com/neotel/smfcore/custom/aiqingzhiyin1643/momo/controller/MomoController.java
...@@ -11,6 +11,7 @@ import com.neotel.smfcore.core.order.service.po.LiteOrder; ...@@ -11,6 +11,7 @@ import com.neotel.smfcore.core.order.service.po.LiteOrder;
import com.neotel.smfcore.core.order.service.po.LiteOrderItem; import com.neotel.smfcore.core.order.service.po.LiteOrderItem;
import com.neotel.smfcore.custom.aiqingzhiyin1643.momo.bean.request.*; import com.neotel.smfcore.custom.aiqingzhiyin1643.momo.bean.request.*;
import com.neotel.smfcore.custom.aiqingzhiyin1643.momo.bean.response.ApiResponse; import com.neotel.smfcore.custom.aiqingzhiyin1643.momo.bean.response.ApiResponse;
import com.neotel.smfcore.custom.aiqingzhiyin1643.momo.bean.response.DeliveryOrderResponse;
import com.neotel.smfcore.security.annotation.AnonymousAccess; import com.neotel.smfcore.security.annotation.AnonymousAccess;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
...@@ -68,38 +69,40 @@ public class MomoController { ...@@ -68,38 +69,40 @@ public class MomoController {
@ApiOperation("接口4：MOM传递出库任务给WMS") @ApiOperation("接口4：MOM传递出库任务给WMS")
@RequestMapping("/PDAAPI/DeliveryOrder/InsertDeliveryOrder") @RequestMapping("/PDAAPI/DeliveryOrder/InsertDeliveryOrder")
@AnonymousAccess @AnonymousAccess
public ApiResponse insertDeliveryOrder(@RequestBody DeliveryOrder deliveryOrder){ public DeliveryOrderResponse insertDeliveryOrder(@RequestBody DeliveryOrder deliveryOrder) {
log.info("MOM传递出库任务给WMS:"+ JSON.toJSONString(deliveryOrder)); log.info("MOM传递出库任务给WMS:" + JSON.toJSONString(deliveryOrder));
//判断存不存在 //判断存不存在
String orderNo = deliveryOrder.getStockoutNo(); String orderNo = deliveryOrder.getDeliveryOrder();
LiteOrder liteOrder = liteOrderCache.getLiteOrder(orderNo); LiteOrder liteOrder = liteOrderCache.getLiteOrder(orderNo);
if (liteOrder == null){ if (liteOrder == null) {
liteOrder = liteOrderManager.findByOrderNo(orderNo); liteOrder = liteOrderManager.findByOrderNo(orderNo);
} }
if (liteOrder != null){ if (liteOrder != null) {
return new ApiResponse("出库任务:"+orderNo+"已经存在",null,"error"); return new DeliveryOrderResponse(null, false, "-1", "出库任务:" + orderNo + "已经存在");
} }
liteOrder = createLiteorder(deliveryOrder); liteOrder = createLiteorder(deliveryOrder);
liteOrder = liteOrderManager.createWithItems(liteOrder); liteOrder = liteOrderManager.createWithItems(liteOrder);
liteOrderCache.addOrderToMap(liteOrder); liteOrderCache.addOrderToMap(liteOrder);
return new ApiResponse("接收:"+orderNo+"成功",null,"success"); return new DeliveryOrderResponse(null, true, "", "");
} }
private LiteOrder createLiteorder(DeliveryOrder deliveryOrder) { private LiteOrder createLiteorder(DeliveryOrder deliveryOrder) {
LiteOrder liteOrder = new LiteOrder(); LiteOrder liteOrder = new LiteOrder();
liteOrder.setOrderNo(deliveryOrder.getStockoutNo()); liteOrder.setOrderNo(deliveryOrder.getDeliveryOrder());
liteOrder.setBillType(deliveryOrder.getBillType());
liteOrder.setMomoType(deliveryOrder.getType());
liteOrder.setCreator(deliveryOrder.getCreator());
List<LiteOrderItem> itemList = new ArrayList<>(); List<LiteOrderItem> itemList = new ArrayList<>();
for (DeliveryOrderItem detailItem : deliveryOrder.getDetailItems()) { for (DeliveryOrderMaterial deliveryOrderMaterial : deliveryOrder.getDeliveryOrderMaterial()) {
LiteOrderItem item = new LiteOrderItem(); LiteOrderItem item = new LiteOrderItem();
item.setRi(detailItem.getContainer()); item.setPn(deliveryOrderMaterial.getMaterialCode());
item.setPn(detailItem.getProductNo()); item.setNeedNum((int) Double.parseDouble(deliveryOrderMaterial.getMaterialCodeQty()));
item.setNeedNum(detailItem.getQuantityOnHand()); item.setRowNumber(deliveryOrderMaterial.getRowNumber());
item.setStockoutNoLine(detailItem.getStockoutNoLine()); item.setEquipment(deliveryOrderMaterial.getEquipment());
item.setProductName(detailItem.getProductName()); item.setSubRegion(deliveryOrderMaterial.getSubRegion());
item.setEquipment(detailItem.getEquipment()); item.setStationNo(deliveryOrderMaterial.getStationNo());
item.setSubRegion(detailItem.getSubRegion()); item.setPickLocation(deliveryOrderMaterial.getPickLocation());
item.setStationNo(detailItem.getStationNo());
item.setPickLocation(detailItem.getPickLocation());
itemList.add(item); itemList.add(item);
} }
liteOrder.setOrderItems(itemList); liteOrder.setOrderItems(itemList);
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!