zy-asrs.git - Gitblit

			@@ -363,7 +363,7 @@
			pla.setWeightAnfme(0.0);
			plaService.updateById(pla);
			SaasUtils.insertLog(1, pla.getLocNo(), pla.getBrand(), anfme, getUser().getUsername(),
			null, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null,"全部出库" + anfme,pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
			null, pla.getBatch(), pla.getPackageNo(), pla.getOwner(), pla.getWorkshop(), null,"全部出库" + anfme,pla.getProblem(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
			});

			return R.ok();

			@@ -1233,7 +1233,7 @@

			plaService.updateById(pla);
			SaasUtils.insertLog(0,locNo,pla.getBrand(),pla.getWeightAnfme(),user.getUsername(),
			null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla入库:" + pla.getWeightAnfme(),pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
			null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla入库:" + pla.getWeightAnfme(),pla.getProblem(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
			}

			@Override
			@@ -1288,7 +1288,7 @@
			log.info("pla出库v1,订单出库，更新为待出库或则全部出库，pla:{},anfme:{}，是否替换:{}",pla,anfme,isReplace);
			plaService.updateById(pla);
			SaasUtils.insertLog(1,locNo,pla.getBrand(),anfme,null,null,
			pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla出库前：" + beforeWeightAnfme+",出库：" + anfme,pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
			pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla出库前：" + beforeWeightAnfme+",出库：" + anfme,pla.getProblem(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);

			//更新订单明细
			Order order = orderService.selectByNo(orderNo);
			@@ -1328,7 +1328,7 @@
			plaService.updateById(pla);

			SaasUtils.insertLog(1,pla.getLocNo(),pla.getBrand(),anfme,null,null,
			pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla手动出库前:" + beforeWeightAnfme +",出库：" + anfme,pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
			pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"pla手动出库前:" + beforeWeightAnfme +",出库：" + anfme,pla.getProblem(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);

			}

			@@ -147,7 +147,7 @@
			this.updateById(pla);

			SaasUtils.insertLog(4,pla.getLocNo(),pla.getBrand(),plaQty.getOrderWeight(),user.getUsername(),
			null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"退回前："+beforeWeightAnfme+"，退回后："+pla.getWeightAnfme(),pla.getMemo(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);
			null,pla.getBatch(),pla.getPackageNo(),pla.getOwner(),pla.getWorkshop(),null,"退回前："+beforeWeightAnfme+"，退回后："+pla.getWeightAnfme(),pla.getProblem(),Cools.isEmpty(pla.getProOrderNo()) ? 1 : 0);

			});
			}

	src/main/java/com/zy/asrs/controller/PlaController.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/zy/asrs/service/impl/PlaServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史