ERP_override.git

			@@ -118,6 +118,8 @@
			//获取对象集合循环进行新增修改
			List<FlowCard> flowCardlist = JSONArray.parseArray(JSONObject.toJSONString(object.get("flowCard")), FlowCard.class);
			if (!flowCardlist.isEmpty()){
			//删除一年前且发货的订单库存信息
			finishedGoodsInventoryMapper.deleteFinishedGoodsInventoryDate();
			//获取单号
			String oddNumber= orderNumberSetting("入库");
			for (FlowCard flowCards : flowCardlist) {
			@@ -168,7 +170,7 @@


			//添加出入库记录
			finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea,createTime);
			finishedOperateLogMapper.insertIntFinishedOperateLog(flowCard,userName,oddNumber,container,deliveryDetailMoney,deliveryDetailArea,createTime,getComputeArea.doubleValue());
			Integer finishedGoodsInventorycount = 0;
			finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdContainercount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber(),container);

			@@ -195,7 +197,7 @@
			finishedGoodsInventoryMapper.updateOrderWarehousingState(flowCard.getOrder().getOrderId(),2);
			}
			} else {
			if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark,container)) {
			if (finishedGoodsInventoryMapper.insertFinishedGoodsInventory(flowCard, storageRegion, remark,container,getComputeArea.doubleValue())) {
			//修改流程卡表入库数量
			finishedGoodsInventoryMapper.updateflowcard(flowCard);
			//修改订单明细表入库数量
			@@ -918,6 +920,8 @@
			findOrderDetailNumberd(
			orderDetail.getDeliveryDetail().getOrderId(),
			orderDetail.getDeliveryDetail().getOrderNumber());


			//添加出入库记录
			finishedOperateLogMapper.insertOutFinishedOperateLog(orderDetail,userName,oddNumber,orderDetail.getDeliveryDetail().getBoxNo());
			orderDetailMapper.update(null,
			@@ -1140,11 +1144,13 @@
			oldFinishedGoodsInventory.setInventory(oldFinishedGoodsInventory.getInventory()-finishedGoodsInventory.getQuantityAvailable());
			oldFinishedGoodsInventory.setQuantityAvailable(oldFinishedGoodsInventory.getQuantityAvailable()-finishedGoodsInventory.getQuantityAvailable());
			oldFinishedGoodsInventory.setArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getActualSignalArea());
			oldFinishedGoodsInventory.setComputeGrossArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getComputeArea());

			//新库存数据增加
			finishedGoodsInventory.setId(null);
			finishedGoodsInventory.setInventory(finishedGoodsInventory.getQuantityAvailable());
			finishedGoodsInventory.setArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getActualSignalArea());
			finishedGoodsInventory.setComputeGrossArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getComputeArea());
			finishedGoodsInventory.setEnterStorageTime(null);
			finishedGoodsInventoryMapper.
			update(oldFinishedGoodsInventory,
			@@ -1156,6 +1162,8 @@

			//往操作日志表添加数据
			finishedOperateLog.setQuantity(finishedGoodsInventory.getQuantityAvailable());
			finishedOperateLog.setArea(finishedGoodsInventory.getQuantityAvailable()*finishedGoodsInventory.getComputeArea());
			finishedOperateLog.setComputeArea(finishedGoodsInventory.getComputeArea());
			finishedOperateLog.setRemarks(oldFinishedGoodsInventory.getBoxNo()+"->"+finishedGoodsInventory.getBoxNo());
			finishedOperateLogMapper.insert(finishedOperateLog);

			@@ -1176,10 +1184,12 @@
			oldFinishedGoodsInventory.setInventory(oldFinishedGoodsInventory.getInventory()-finishedGoodsInventory.getQuantityAvailable());
			oldFinishedGoodsInventory.setQuantityAvailable(oldFinishedGoodsInventory.getQuantityAvailable()-finishedGoodsInventory.getQuantityAvailable());
			oldFinishedGoodsInventory.setArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getActualSignalArea());
			oldFinishedGoodsInventory.setComputeGrossArea(oldFinishedGoodsInventory.getInventory()*oldFinishedGoodsInventory.getComputeArea());

			existFinishedGoodsInventory.setInventory(existFinishedGoodsInventory.getInventory()+finishedGoodsInventory.getQuantityAvailable());
			existFinishedGoodsInventory.setQuantityAvailable(existFinishedGoodsInventory.getQuantityAvailable()+finishedGoodsInventory.getQuantityAvailable());
			existFinishedGoodsInventory.setArea(existFinishedGoodsInventory.getInventory()*existFinishedGoodsInventory.getActualSignalArea());
			existFinishedGoodsInventory.setComputeGrossArea(existFinishedGoodsInventory.getInventory()*existFinishedGoodsInventory.getComputeArea());

			finishedGoodsInventoryMapper.
			update(oldFinishedGoodsInventory,
			@@ -1194,6 +1204,7 @@

			//往操作日志表添加数据
			finishedOperateLog.setQuantity(finishedGoodsInventory.getQuantityAvailable());
			finishedOperateLog.setComputeArea(existFinishedGoodsInventory.getComputeArea());
			finishedOperateLog.setRemarks(oldFinishedGoodsInventory.getBoxNo()+"->"+existFinishedGoodsInventory.getBoxNo());
			finishedOperateLogMapper.insert(finishedOperateLog);