Compare commits
No commits in common. "0da72b8e0cbee1b9ed21bd1128b32bbb53c6aaeb" and "4b4c98c2627485317d1e7e541075906fc97f4f22" have entirely different histories.
0da72b8e0c
...
4b4c98c262
|
|
@ -123,7 +123,6 @@ public class OutPurchaseController extends BaseController {
|
|||
.setWerks(it.getFactoryCode())
|
||||
.setMeins(it.getUnit())
|
||||
.setLgort(it.getStorageLocation())
|
||||
.setEbelp(it.getPoLineNumberNew().toString())
|
||||
)
|
||||
.toList()
|
||||
);
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ import jakarta.validation.constraints.NotNull;
|
|||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
import software.amazon.awssdk.services.s3.endpoints.internal.Value;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.time.LocalDateTime;
|
||||
|
|
@ -203,10 +202,10 @@ public class PurchaseReturnController extends BaseController {
|
|||
for (WmsReturnRequestItem item : returnRequestItems) {
|
||||
ZWM3A25ItemDTO itemDTO25 = new ZWM3A25ItemDTO();
|
||||
itemDTO25.setWerks(item.getFactoryCode());
|
||||
itemDTO25.setMenge_Ret(item.getRequestQuantity());
|
||||
itemDTO25.setMenge_Ret(item.getRequestQuantity().toString());
|
||||
itemDTO25.setLgort(item.getStorageLocation());
|
||||
itemDTO25.setMatnr(item.getMaterialCode());
|
||||
itemDTO25.setEbelp_old(Integer.parseInt(item.getPoLineNumber()));
|
||||
itemDTO25.setEbelp_old(item.getPoLineNumber());
|
||||
//itemDTO25.setEbelpNew(item.getDeliveryLineNo());
|
||||
itemDTOList25.add(itemDTO25);
|
||||
}
|
||||
|
|
@ -222,24 +221,14 @@ public class PurchaseReturnController extends BaseController {
|
|||
for (WmsReturnRequestItem item : returnRequestItems) {
|
||||
ZWM3A24ItemDTO itemDTO24 = new ZWM3A24ItemDTO();
|
||||
itemDTO24.setWerks(item.getFactoryCode());
|
||||
itemDTO24.setMenge_Ret(item.getRequestQuantity());
|
||||
itemDTO24.setMenge_Ret(item.getRequestQuantity().toString());
|
||||
itemDTO24.setLgort(item.getStorageLocation());
|
||||
itemDTO24.setMatnr(item.getMaterialCode());
|
||||
itemDTO24.setEbelp_Old(Integer.parseInt(item.getPoLineNumber()));
|
||||
itemDTO24.setEbelp_Old(item.getPoLineNumber());
|
||||
itemDTOList24.add(itemDTO24);
|
||||
}
|
||||
ZWM3A24ReturnDTO retrunDto24 = sapService.ZWM3A24(headDTO24, itemDTOList24);
|
||||
log.info(" zwm3a24ReturnDTO: " + JSONUtil.toJsonStr(retrunDto24));
|
||||
retrunDto24.getItemReturnDTOList().forEach(item -> {
|
||||
WmsReturnRequestItem dbItem=returnRequestItems.stream()
|
||||
.filter(it -> StrUtil.equals(it.getMaterialCode(), item.getMatnr())
|
||||
&& Objects.equals(Integer.parseInt(it.getPoLineNumber()), item.getEbelp_old())
|
||||
)
|
||||
.findFirst()
|
||||
.get();
|
||||
dbItem.setPoLineNumberNew(item.getEbelp_new());
|
||||
});
|
||||
returnRequestItemService.updateBatchById(returnRequestItems);
|
||||
}
|
||||
}
|
||||
//修改状态
|
||||
|
|
|
|||
|
|
@ -969,8 +969,7 @@ public class StructuralPackageOrderController extends BaseController {
|
|||
if (structuralPackageDeliverOrderService.updateStateByOrderId(request.getId()) == 2) {
|
||||
qrCodeMasterService.lambdaUpdate()
|
||||
.set(WmsQrCodeMaster::getProcessStage, BarCodeProcessStage.InBound.getState())
|
||||
.set(WmsQrCodeMaster::getLastScanBy, UserUtil.getUserId())
|
||||
.set(WmsQrCodeMaster::getLastScanByname, UserUtil.getUserName())
|
||||
.set(WmsQrCodeMaster::getLastScanBy, UserUtil.getUserName())
|
||||
.set(WmsQrCodeMaster::getLastScanTime, LocalDateTime.now())
|
||||
.eq(WmsQrCodeMaster::getExtendId, request.getId())
|
||||
.update();
|
||||
|
|
@ -986,7 +985,6 @@ public class StructuralPackageOrderController extends BaseController {
|
|||
.setNum(BigDecimal.valueOf(order.getNum()))
|
||||
.setFactoryNo(order.getFactoryNo())
|
||||
.setWarehouseNo(request.getWarehouse())
|
||||
.setBinLocation(request.getBinNo())
|
||||
.setBatchNo("")
|
||||
.setSerialNo("")
|
||||
)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,9 @@
|
|||
package com.nflg.wms.admin.pojo.request;
|
||||
|
||||
import jakarta.annotation.Priority;
|
||||
import jakarta.validation.constraints.Min;
|
||||
import jakarta.validation.constraints.NotNull;
|
||||
import jakarta.validation.constraints.Positive;
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
|
@ -19,6 +21,6 @@ public class UnqualifiedWarehousingRequest {
|
|||
* 收货数量
|
||||
*/
|
||||
@NotNull
|
||||
@Min(value = 0)
|
||||
@Positive
|
||||
private BigDecimal receiveQty;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -179,8 +179,8 @@
|
|||
<td th:text="${item.materialDescription}" class="col-left">非金属联件和紧固件等 M6 DIN 982 不锈钢304</td>
|
||||
<td th:text="${item.unit}">PC</td>
|
||||
<td th:text="${item.requestQuantity}">10.00</td>
|
||||
<td th:text="${item.factoryCode}"></td>
|
||||
<td th:text="${item.storageLocation}"></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</table>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,6 @@ package com.nflg.wms.common.pojo.dto;
|
|||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class ZWM3A24ItemDTO{
|
||||
/**
|
||||
|
|
@ -14,7 +12,7 @@ public class ZWM3A24ItemDTO{
|
|||
/**
|
||||
* 数量
|
||||
*/
|
||||
private BigDecimal menge_Ret;
|
||||
private String menge_Ret;
|
||||
|
||||
|
||||
/**
|
||||
|
|
@ -30,5 +28,5 @@ public class ZWM3A24ItemDTO{
|
|||
/**
|
||||
* 原订单行号
|
||||
*/
|
||||
private Integer ebelp_Old;
|
||||
private String ebelp_Old;
|
||||
}
|
||||
|
|
@ -2,53 +2,38 @@ package com.nflg.wms.common.pojo.dto;
|
|||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class ZWM3A24ItemReturnDTO{
|
||||
|
||||
/**
|
||||
* 工厂
|
||||
*/
|
||||
private String werks;
|
||||
|
||||
/**
|
||||
* 原订单行号
|
||||
* 采购凭证的项目编号
|
||||
*/
|
||||
private Integer ebelp_old;
|
||||
|
||||
/**
|
||||
* 新单行号
|
||||
*/
|
||||
private Integer ebelp_new;
|
||||
|
||||
private String ebelp;
|
||||
/**
|
||||
* 库存地点
|
||||
*/
|
||||
private String lgort;
|
||||
|
||||
// /**
|
||||
// * 物料描述（短文本）
|
||||
// */
|
||||
// private String maktx;
|
||||
|
||||
// /**
|
||||
// * 退货项目
|
||||
// */
|
||||
// private String retpo;
|
||||
|
||||
// /**
|
||||
// * 采购凭证号
|
||||
// */
|
||||
// private String ebeln;
|
||||
|
||||
/**
|
||||
* 物料描述（短文本）
|
||||
*/
|
||||
private String maktx;
|
||||
/**
|
||||
* 退货项目
|
||||
*/
|
||||
private String retpo;
|
||||
/**
|
||||
* 采购凭证号
|
||||
*/
|
||||
private String ebeln;
|
||||
/**
|
||||
* 物料号
|
||||
*/
|
||||
private String matnr;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
private BigDecimal menge_ret;
|
||||
private String menge;
|
||||
}
|
||||
|
|
@ -2,8 +2,6 @@ package com.nflg.wms.common.pojo.dto;
|
|||
|
||||
import lombok.Data;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
|
||||
@Data
|
||||
public class ZWM3A25ItemDTO{
|
||||
|
||||
|
|
@ -11,22 +9,18 @@ public class ZWM3A25ItemDTO{
|
|||
* 工厂
|
||||
*/
|
||||
private String werks;
|
||||
|
||||
/**
|
||||
* 数量
|
||||
*/
|
||||
private BigDecimal menge_Ret;
|
||||
|
||||
private String menge_Ret;
|
||||
/**
|
||||
* 消息
|
||||
*/
|
||||
private String msg;
|
||||
|
||||
/**
|
||||
* 库存地点
|
||||
*/
|
||||
private String lgort;
|
||||
|
||||
/**
|
||||
* 新单行号
|
||||
*/
|
||||
|
|
@ -35,9 +29,8 @@ public class ZWM3A25ItemDTO{
|
|||
* 物料号
|
||||
*/
|
||||
private String matnr;
|
||||
|
||||
/**
|
||||
* 原订单行号
|
||||
*/
|
||||
private Integer ebelp_old;
|
||||
private String ebelp_old;
|
||||
}
|
||||
|
|
@ -95,5 +95,6 @@ public class BarcodePrintingEditQO {
|
|||
/**
|
||||
* 储位编号
|
||||
*/
|
||||
@NotBlank
|
||||
private String binNo;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ public class StructuralPackageOrderReceiveQO {
|
|||
/**
|
||||
* 储位
|
||||
*/
|
||||
@NotBlank
|
||||
@NotNull
|
||||
private String binNo;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -84,11 +84,6 @@ public class WmsReturnRequestItem implements Serializable {
|
|||
@TableField(value = "\"left\"")
|
||||
private BigDecimal left;
|
||||
|
||||
/**
|
||||
* sap过账的行号
|
||||
*/
|
||||
private Integer poLineNumberNew;
|
||||
|
||||
/**
|
||||
* 出库状态
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue