rakor
/
wms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bug-1508 PDA-卸货清点

This commit is contained in:
曹鹏飞 2026-05-25 09:55:01 +08:00
parent 93ee65e3c9
commit c842372069
6 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/entity/WmsShipmentPackagingCode.java
View File

@ -47,7 +47,7 @@ public class WmsShipmentPackagingCode implements Serializable {
private Long type;
/**
* 状态，0：未装货；1：已装货；2：已装车；3：已发车；4：已卸车
* 状态，0：未装货；1：已装货；2：已装车；3：已发车；4：已收货
*/
private Integer status;

2
nflg-wms-repository/src/main/java/com/nflg/wms/repository/mapper/WmsShipmentPackagingCodeMapper.java
View File

@ -32,4 +32,6 @@ public interface WmsShipmentPackagingCodeMapper extends BaseMapper<WmsShipmentPa
List<ShipmentMaterialCodeQRVO> getForInstall(Long id);
IPage<ShipmentMaterialCodeItemVO> getItemsVOById(ShipmentSiteStockItemQO qo, Page<?> objectPage);
void updateMaterialStatus(List<Long> ids, int status);
}

3
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/IWmsShipmentPackagingCodeService.java
View File

@ -8,6 +8,7 @@ import com.nflg.wms.common.pojo.vo.*;
import com.nflg.wms.repository.entity.WmsShipmentPackagingCode;
import com.baomidou.mybatisplus.extension.service.IService;
import jakarta.validation.Valid;
import jakarta.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotNull;
import java.util.List;
@ -36,4 +37,6 @@ public interface IWmsShipmentPackagingCodeService extends IService<WmsShipmentPa
List<ShipmentMaterialCodeQRVO> getForInstall(Long id);
IPage<ShipmentMaterialCodeItemVO> getItemsVOById(ShipmentSiteStockItemQO qo);
void updateMaterialStatus(List<Long> ids, int status);
}

5
nflg-wms-repository/src/main/java/com/nflg/wms/repository/service/impl/WmsShipmentPackagingCodeServiceImpl.java
View File

@ -59,4 +59,9 @@ public class WmsShipmentPackagingCodeServiceImpl extends ServiceImpl<WmsShipment
public IPage<ShipmentMaterialCodeItemVO> getItemsVOById(ShipmentSiteStockItemQO qo) {
return baseMapper.getItemsVOById(qo, new Page<>(qo.getPage(), qo.getPageSize()));
}
@Override
public void updateMaterialStatus(List<Long> ids, int status) {
baseMapper.updateMaterialStatus(ids, status);
}
}

18
nflg-wms-repository/src/main/resources/mapper/WmsShipmentPackagingCodeMapper.xml
View File

@ -86,4 +86,22 @@
INNER JOIN wms_shipment_material_code_item mci ON mciq.item_id=mci."id"
where mciq.status!=5 and pci.packaging_code_id=#{qo.id}
</select>
<update id="updateMaterialStatus">
UPDATE wms_shipment_material_code_item_qr wsmciq
SET status = #{status}
FROM wms_shipment_packaging_code_item wspci
WHERE wspci.material_code_item_qr_id = wsmciq.id AND wspci.packaging_code_id in
<foreach item="id" collection="ids" separator="," open="(" close=")">
#{id}
</foreach>;
UPDATE wms_shipment_material_code_item wsmci
SET status = #{status}
FROM wms_shipment_material_code_item_qr wsmciq
JOIN wms_shipment_packaging_code_item wspci ON wspci.material_code_item_qr_id=wsmciq."id"
WHERE wsmci."id" = wsmciq.item_id AND wspci.packaging_code_id in
<foreach item="id" collection="ids" separator="," open="(" close=")">
#{id}
</foreach>;
</update>
</mapper>

3
nflg-wms-shipment/src/main/java/com/nflg/wms/shipment/controller/H5Controller.java
View File

@ -80,9 +80,10 @@ public class H5Controller extends BaseController {
List<ShipmentPackagingCodeMaterialVO> items = packagingCodeItemService.getList(ids);
packagingCodeService.lambdaUpdate()
.set(WmsShipmentPackagingCode::getStatus, 4)
.eq(WmsShipmentPackagingCode::getStatus, 3)
.ne(WmsShipmentPackagingCode::getStatus, 4)
.in(WmsShipmentPackagingCode::getId, ids)
.update();
packagingCodeService.updateMaterialStatus(ids,4);
List<WmsShipmentDelivery> deliveries = deliveryService.listByIds(items.stream()
.map(ShipmentPackagingCodeMaterialVO::getDeliveryId)
.collect(Collectors.toSet())