#上报1

cl

7 天以前 1a7a40cde5018124cac598f4a8db0cbcbeba386b

#上报1

 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InOutResultReportParam.java

@@ -19,6 +19,12 @@
    @ApiModelProperty("计划跟踪号")
    private String planNo;

    @ApiModelProperty("工作类型（wk_type），用于云仓 docType")
    private String wkType;

    @ApiModelProperty("单位编码")
    private String unitNo;

    @ApiModelProperty("行内码")
    private String lineId;


 rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/params/InventoryAdjustReportParam.java

@@ -41,7 +41,7 @@
    @ApiModelProperty("项次")
    private String docSeqNo;

    @ApiModelProperty("单据类别（空则按 changeType 取配置 dap.doc-type-in/out/adj）")
    @ApiModelProperty("单据类别")
    private String docType;

    @ApiModelProperty("批次")
@@ -50,6 +50,6 @@
    @ApiModelProperty("条码（云仓必填）")
    private String barcode;

    @ApiModelProperty("单位编码（空则取配置 dap.unit-no）")
    @ApiModelProperty("单位编码")
    private String unitNo;
}

 rsf-server/src/main/java/com/vincent/rsf/server/api/service/impl/CloudWmsReportServiceImpl.java

@@ -105,15 +105,19 @@
    private DapIlcwmsCompletionLine buildInOutLine(InOutResultReportParam param, boolean inbound) {
        RemotesInfoProperties.Dap dap = erpApi.getDap();
        CloudMatnrParts matnrParts = parseCloudMatnr(param.getMatNr());
        String docType = StringUtils.isNotBlank(param.getWkType())
                ? param.getWkType()
                : (inbound ? "IN" : "OUT");
        String unitNo = StringUtils.isNotBlank(param.getUnitNo()) ? param.getUnitNo() : "PCS";
        DapIlcwmsCompletionLine line = new DapIlcwmsCompletionLine()
                .setOrgNo(dap.getOrgNo())
                .setDocType(inbound ? dap.getDocTypeIn() : dap.getDocTypeOut())
                .setDocType(docType)
                .setDocNo(param.getOrderNo())
                .setDocSeqNo(StringUtils.isNotBlank(param.getLineId()) ? param.getLineId() : "1")
                // 按云仓规则拆分物料编码
                .setItemNo(matnrParts.getItemNo())
                .setQty(parseQty(param.getQty()))
                .setUnitNo(dap.getUnitNo())
                .setUnitNo(unitNo)
                .setCombinationLotNo(matnrParts.getCombinationLotNo())
                .setBarcode(matnrParts.getBarcode());
        if (inbound) {
@@ -131,11 +135,11 @@
     */
    private DapIlcwmsCompletionLine buildAdjustLine(InventoryAdjustReportParam param, boolean fillIn, boolean fillOut, String docSeqOverride) {
        RemotesInfoProperties.Dap dap = erpApi.getDap();
        String docType = resolveAdjustDocType(param, dap);
        String docType = resolveAdjustDocType(param);
        String docNo = StringUtils.isNotBlank(param.getDocNo()) ? param.getDocNo() : "ADJ";
        String docSeq = docSeqOverride != null ? docSeqOverride
                : (StringUtils.isNotBlank(param.getDocSeqNo()) ? param.getDocSeqNo() : "1");
        String unit = StringUtils.isNotBlank(param.getUnitNo()) ? param.getUnitNo() : dap.getUnitNo();
        String unit = StringUtils.isNotBlank(param.getUnitNo()) ? param.getUnitNo() : "PCS";
        CloudMatnrParts matnrParts = parseCloudMatnr(param.getMatNr());
        DapIlcwmsCompletionLine line = new DapIlcwmsCompletionLine()
                .setOrgNo(dap.getOrgNo())
@@ -159,18 +163,18 @@
        return line;
    }

    private static String resolveAdjustDocType(InventoryAdjustReportParam param, RemotesInfoProperties.Dap dap) {
    private static String resolveAdjustDocType(InventoryAdjustReportParam param) {
        if (StringUtils.isNotBlank(param.getDocType())) {
            return param.getDocType();
        }
        Integer ct = param.getChangeType();
        if (ct != null && ct == 2) {
            return dap.getDocTypeOut();
            return "OUT";
        }
        if (ct != null && ct == 3) {
            return dap.getDocTypeAdj();
            return "ADJ";
        }
        return dap.getDocTypeIn();
        return "IN";
    }

    // private static String resolveBarcode(InOutResultReportParam param) {

 rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/TaskServiceImpl.java

@@ -2910,6 +2910,8 @@
                InOutResultReportParam param = new InOutResultReportParam()
                        .setOrderNo(orderNo)
                        .setPlanNo(item.getPlatWorkCode())
                        .setWkType(item.getWkType())
                        .setUnitNo(item.getUnit())
                        .setLineId(item.getPlatItemId())
                        .setWareHouseId(wareHouseId)
                        .setLocId(locId)

 rsf-server/src/main/resources/application-prod.yml

@@ -103,11 +103,7 @@
    base-url: http://192.168.10.108:8180
    # 鼎捷 DAP ilcwmsplus 完成反馈（9.1/9.2 组包用）
    dap:
      org-no: ""
      doc-type-in: ""
      doc-type-out: ""
      doc-type-adj: ""
      unit-no: PCS
      org-no: "1"
    #接口明细（质检等；下方 stock-in/out-completed-path 与 CloudWmsErpFeignClient 一致；调拨 changeType=3 为 stockTransferCompleted）
    api:
      notify-inspect: /report/inspect