Browse Source

推送bug

master
常熟吴彦祖 7 months ago
parent
commit
a36486e7be
  1. 2
      src/main/java/com/gaotao/modules/api/entity/NotifyDataToWcs.java
  2. 4
      src/main/java/com/gaotao/modules/api/entity/NotifyDataToWcsPalletList.java
  3. 2
      src/main/java/com/gaotao/modules/api/entity/NotifyDataToWcsPalletSubDetail.java
  4. 8
      src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java
  5. 2
      src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml
  6. 2
      src/main/resources/mapper/notify/NewIssureMapper.xml

2
src/main/java/com/gaotao/modules/api/entity/NotifyDataToWcs.java

@ -10,5 +10,5 @@ public class NotifyDataToWcs {
private String site;//工厂编码
private String taskNo;//任务单号
private Integer itemNo; //任务行号
private List<NotifyDataToWcsPalletList> palletList;
private List<NotifyDataToWcsPalletList> materialRequisitions;
}

4
src/main/java/com/gaotao/modules/api/entity/NotifyDataToWcsPalletList.java

@ -6,6 +6,6 @@ import java.util.List;
@Data
public class NotifyDataToWcsPalletList {
private String palletBarcode;//托盘码
private List<NotifyDataToWcsPalletSubDetail> detail;
private String palletCode;//托盘码
private List<NotifyDataToWcsPalletSubDetail> materials;
}

2
src/main/java/com/gaotao/modules/api/entity/NotifyDataToWcsPalletSubDetail.java

@ -9,5 +9,5 @@ import java.util.List;
public class NotifyDataToWcsPalletSubDetail {
private Integer position; //点位
private Integer layer; //层数
private List<String> serialNos;
private List<String> rfidBarcodes;
}

8
src/main/java/com/gaotao/modules/notify/service/impl/NewIssureServiceImpl.java

@ -918,7 +918,7 @@ public class NewIssureServiceImpl implements NewIssureService {
// 构建NotifyDataToWcsPalletList - rqrq
NotifyDataToWcsPalletList palletData = new NotifyDataToWcsPalletList();
palletData.setPalletBarcode(palletId);
palletData.setPalletCode(palletId);
List<NotifyDataToWcsPalletSubDetail> subDetailList = new ArrayList<>();
for (Map.Entry<String, Map<Integer, List<String>>> posEntry : groupedByPositionLayer.entrySet()) {
@ -930,18 +930,18 @@ public class NewIssureServiceImpl implements NewIssureService {
NotifyDataToWcsPalletSubDetail subDetail = new NotifyDataToWcsPalletSubDetail();
subDetail.setPosition(Integer.parseInt(position));
subDetail.setLayer(layer);
subDetail.setSerialNos(serialNos);
subDetail.setRfidBarcodes(serialNos);
subDetailList.add(subDetail);
}
}
palletData.setDetail(subDetailList);
palletData.setMaterials(subDetailList);
palletList.add(palletData);
}
}
wcsData.setPalletList(palletList);
wcsData.setMaterialRequisitions(palletList);
System.out.println("构建WCS数据完成,栈板数:" + palletList.size() + " - rqrq");
// 6.8 先调用WCS接口成功后再执行数据库操作- rqrq

2
src/main/resources/mapper/automatedWarehouse/WcsIntegrationMapper.xml

@ -454,7 +454,7 @@
WITH RankedRecords AS (
SELECT
out_wcs_flag,
ROW_NUMBER() OVER (ORDER BY notifyNo DESC) AS rn
ROW_NUMBER() OVER (ORDER BY notify_no DESC) AS rn
FROM SOIssueNotifyOrderMaterialList_detail
WHERE site = #{site}
AND serialNo = #{serialNo}

2
src/main/resources/mapper/notify/NewIssureMapper.xml

@ -224,7 +224,7 @@
<!-- rqrq - 批量插入SOIssueNotifyOrderMaterialList_detail记录 -->
<insert id="batchInsertMaterialListDetail">
INSERT INTO SOIssueNotifyOrderMaterialList_detail
(site, notifyNo, item_no, BOM_item_no, serialNo, task_ref, task_item, task_seq, out_wcs_flag, issure_flag)
(site, notify_no, item_no, BOM_item_no, serialNo, task_ref, task_item, task_seq, out_wcs_flag, issure_flag)
VALUES
<foreach collection="list" item="item" separator=",">
(#{item.site}, #{item.notifyNo}, #{item.itemNo}, #{item.bomItemNo}, #{item.serialNo},

Loading…
Cancel
Save