ERP_override.git

			@@ -142,6 +142,7 @@
			@Param("orderNumber") Integer orderNumber,@Param("deliveryId") String deliveryId);


			Integer findOrderNumberdContainercount(String orderId, Integer orderNumber, String container);
			}

			@@ -86,7 +86,7 @@
			if (object.get("storageRegion") != null) {
			storageRegion = object.get("storageRegion").toString();
			}
			if (object.get("container") != null) {
			if (object.get("container") != null) {//箱号
			container = object.get("container").toString();
			}

			@@ -162,7 +162,11 @@

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

			//finishedGoodsInventorycount = finishedGoodsInventoryMapper.findOrderNumberdcount(flowCard.getOrder().getOrderId(),flowCard.getOrderNumber());

			Integer ordersum = finishedGoodsInventoryMapper.findOrderQuantity(flowCard.getOrder().getOrderId());
			Integer ordernumbersum = finishedGoodsInventoryMapper.findOrderNumberdsum(flowCard.getOrder().getOrderId());
			FlowCard flowCard1=finishedGoodsInventoryMapper.findFlowCard(flowCard);

			@@ -521,7 +521,7 @@
			<if test="container != null and container != ''">
			, box_no= #{container}
			</if>
			where order_number=#{flowCard.orderNumber} and order_id=#{flowCard.order.orderId}
			where order_number=#{flowCard.orderNumber} and order_id=#{flowCard.order.orderId} and box_no= #{container}
			</update>

			<update id="updateInventoryOut">
			@@ -563,6 +563,13 @@

			</select>

			<select id="findOrderNumberdContainercount" >
			select count(*)
			from mm.`finished_goods_inventory`
			where order_number = #{orderNumber} and order_id=#{orderId} and box_no=#{container};

			</select>

			<select id="findOrderNumberd" >
			select *
			from mm.`finished_goods_inventory`

	north-glass-erp/src/main/java/com/example/erp/mapper/mm/FinishedGoodsInventoryMapper.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/java/com/example/erp/service/mm/FinishedGoodsInventoryService.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	north-glass-erp/src/main/resources/mapper/mm/FinishedGoodsInventory.xml	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史