Commit 332e26bd authored by knight's avatar knight Committed by wux

bug228 (生产)A2500234GA订单调仓到仓动态出现:状态错误

parent b9207235
......@@ -321,6 +321,8 @@ public interface ErrorCodeConstants {
ErrorCode ORDER_IS_WAITING_SHIPMENT = new ErrorCode(1006010079, "order.is.waiting.shipment");
ErrorCode WAREHOUSE_IN_RECORD_DATA_NOT_IS_ZERO = new ErrorCode(1006010080, "warehouse.in.record.data.not.is.zero");
ErrorCode WAREHOUSE_ADJUST_ILLEGAL_OPERATION = new ErrorCode(1006010081, "warehouse.adjust.illegal.operation");
ErrorCode USER_NOT_EXISTS = new ErrorCode(1004001000, "member.user.not.exist");
ErrorCode ORDER_NEED_PERSONAL_KYC = new ErrorCode(1004001112, "order.need.personal.kyc");
......
......@@ -475,6 +475,10 @@ public class OrderWarehouseAdjustServiceImpl extends AbstractService<OrderWareho
if (orderWarehouseAdjustDO == null) {
throw exception(WAREHOUSE_ADJUST_NOT_EXISTS);
}
// 不是出仓状态不可操作到仓
if (!Objects.equals(OrderWarehouseAdjustStatusEnum.deliveries.getValue() , orderWarehouseAdjustDO.getStatus())){
throw exception(WAREHOUSE_ADJUST_ILLEGAL_OPERATION);
}
String note = "";
// 转异
......
......@@ -130,6 +130,7 @@ order.warehouse.check.not.exists=order warehouse check not exists
order.warehouse.check.bad.volume=order warehouse check bad volume
order.warehouse.check.bad.weight=order warehouse check bad weight
warehouse.adjust.not.exists=warehouse adjust not exists
warehouse.adjust.illegal.operation=warehouse adjust illegal operation
shipment.not.exists=Shipment does not exist
shipment.order.exit.not.exists=Order exit information does not exist
line.not.open=line not open
......
......@@ -130,6 +130,7 @@ order.warehouse.check.not.exists=D\u00E9tails des marchandises non trouv\u00E9s
order.warehouse.check.bad.volume=Volume de marchandise d\u00E9pass\u00E9 \u00E0 l'entrep\u00F4t
order.warehouse.check.bad.weight=Poids de marchandise d\u00E9pass\u00E9 \u00E0 l'entrep\u00F4t
warehouse.adjust.not.exists=Aucune trace de transfert de stock n'existe
warehouse.adjust.illegal.operation=l'entrep\u00F4t ajuste l'op\u00E9ration ill\u00E9gale
shipment.not.exists=Bon de sortie introuvable
shipment.order.exit.not.exists=Information de sortie de la commande introuvable
line.not.open=La ligne n'est pas activ\u00E9e
......@@ -661,7 +662,7 @@ prod.brand.not.null=La marque ne peut \u00EAtre vide ou z\u00E9ro
preload.not.exist=Bon de sortie sans marchandise pr\u00E9charg\u00E9e
warehouse.in.property.not.null.and.zero=La valeur de {} pour le produit [{}] ne peut \u00EAtre vide ou \u00E9gale \u00E0 0
warehouse.in.box.exception=Les commandes d\u00E9j\u00E0 planifi\u00E9es ne peuvent pas \u00EAtre modifi\u00E9es dans le syst\u00E8me de stockage
order.update.box.exception=Les commandes sont déjà listées
order.update.box.exception=Les commandes sont d\u00E9j\u00E0 list\u00E9es
split.order.can.not.change.carton.num=Le nombre de colis dans une sous-commande ne peut \u00EAtre modifi\u00E9
split.order.can.not.change.order.label=Le num\u00E9ro d'\u00E9tiquette des colis d'une sous-commande ne peut \u00EAtre modifi\u00E9
split.order.can.not.warehouse.in=Sous-commande ne peut pas ajouter de nouveaux articles ou cr\u00E9er de nouvelles entr\u00E9es de stock
......
......@@ -130,6 +130,7 @@ order.warehouse.check.not.exists=\u5230\u4ED3\u8D27\u7269\u8BE6\u60C5\u4E0D\u5B5
order.warehouse.check.bad.volume=\u5230\u4ED3\u8D27\u7269\u4F53\u79EF\u8D85\u51FA
order.warehouse.check.bad.weight=\u5230\u4ED3\u8D27\u7269\u91CD\u91CF\u8D85\u51FA
warehouse.adjust.not.exists=\u8C03\u4ED3\u8BB0\u5F55\u4E0D\u5B58\u5728
warehouse.adjust.illegal.operation=\u8C03\u4ED3\u8BB0\u5F55\u975E\u6CD5\u64CD\u4F5C
shipment.not.exists=\u51FA\u8D27\u4E0D\u5B58\u5728
shipment.order.exit.not.exists=\u8BA2\u5355\u9000\u573A\u4FE1\u606F\u4E0D\u5B58\u5728
line.not.open=\u7EBF\u8DEF\u672A\u5F00\u901A
......@@ -666,7 +667,7 @@ prod.brand.not.null=\u54C1\u724C\u4E0D\u80FD\u4E3A\u7A7A\u62160
preload.not.exist=\u51FA\u8D27\u5355\u672A\u9884\u88C5\u8D27\u7269
warehouse.in.property.not.null.and.zero=\u5546\u54C1[{}]\u7684{}\u4E0D\u80FD\u4E3A\u7A7A\u62160
warehouse.in.box.exception=\u8BA2\u5355\u5DF2\u7ECF\u6392\u5355\u4E0D\u80FD\u64CD\u4F5C\u4ED3\u5E93\u6570\u636E
order.update.box.exception=\u8ba2\u5355\u5df2\u7ecf\u6392\u5355
order.update.box.exception=\u8BA2\u5355\u5DF2\u7ECF\u6392\u5355
split.order.can.not.change.carton.num=\u62C6\u5355\u8BA2\u5355\u4E0D\u53EF\u6539\u7BB1\u6570
split.order.can.not.change.order.label=\u62C6\u5355\u8BA2\u5355\u4E0D\u53EF\u6539\u6807\u7B7E\u7BB1\u53F7
split.order.can.not.warehouse.in=\u62C6\u5355\u8BA2\u5355\u4E0D\u53EF\u8FFD\u52A0\u5546\u54C1\u548C\u6DFB\u52A0\u65B0\u5165\u4ED3\u7EAA\u5F55
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment