印尼佳通-GT服务开发

杨前锦

21 小时以前 06a8b6963d6d4f229d4e196b4b09ce57e2cbf2dd

 HH.WCS.Mobox3/HH.WCS.Mobox3.SXJK/core/WCSCore.cs

@@ -225,13 +225,22 @@
                                                var cntrItemRels = ContainerHelper.GetCntrItemRel(cntrCode);
                                                if (cntrItemRels != null && cntrItemRels.Count > 0)
                                                {
                                                    LogHelper.Info($"OperateGZTaskStatus: 2 ,cntrCode:{cntrCode},S_ASN_NO ={cntrItemRels[0].S_ASN_NO},", "WMS");
                                                    var inStockListChilds = WMSHelper.getInstockListChild(cntrCode, cntrItemRels[0].S_ASN_NO);
                                                    var cntrItemRel = cntrItemRels[0];
                                                    LogHelper.Info($"OperateGZTaskStatus: 2 ,cntrCode:{cntrCode},S_ASN_NO ={cntrItemRel.S_ASN_NO},", "WMS");
                                                    var inStockListChilds = WMSHelper.getInstockListChild(cntrCode, cntrItemRel.S_ASN_NO);
                                                    LogHelper.Info($"OperateGZTaskStatus: 2 ,inStockListChilds.count:{inStockListChilds.Count}", "WMS");
                                                    if (inStockListChilds != null && inStockListChilds.Count > 0) 
                                                    {
                                                        LogHelper.Info("OperateGZTaskStatus: 3", "WMS");
                                                        receiveGoodsFeedback(inStockListChilds, cntrItemRels[0].F_NET_WEIGHT.ToString(), cntrCode, TN_Task.S_END_LOC);
                                                        receiveGoodsFeedback(inStockListChilds, cntrItemRel.F_NET_WEIGHT.ToString(), cntrCode, TN_Task.S_END_LOC);

                                                        // 入库完成，回报WMS后，更新SPA批次号
                                                        var inStockListChildren = Monitor.getInStockTrayInfo(cntrCode);
                                                        if (inStockListChildren != null && inStockListChildren.Count > 0) 
                                                        {
                                                            cntrItemRel.LOTATT04 = inStockListChildren[0].LOTATT04;
                                                            ContainerHelper.UpdateCntrItemRel(cntrItemRel);
                                                        }
                                                    }
                                                }
                                            }
@@ -311,6 +320,25 @@
                        {
                            ContainerHelper.deleteCntrItem(cntrCode);
                        }
                    }

                    if (wst.S_TYPE == "出库任务") 
                    {
                        var child = WMSHelper.getOutstockListChild(wst.S_OP_DEF_CODE, cst.S_DATA);

                        var cntrCodeList = cst.S_CNTR_CODE.Split(',').ToList();
                        // 更新出库数量
                        float qty = 0;
                        for (int i = 0; i < cntrCodeList.Count; i++)
                        {
                            var cntrItemRels = ContainerHelper.GetCntrItemRel(cntrCodeList[i]);
                            foreach (var cntrItemRel in cntrItemRels)
                            {
                                qty += cntrItemRel.F_QTY;
                            }
                        }
                        child.PRE_COMPLETED_QTY = child.PRE_COMPLETED_QTY - qty;
                        WMSHelper.updateOutStockListChild(child);
                    }
                }
            }
@@ -427,35 +455,29 @@
                                {
                                    outStockFeedbackDatas.Add(feedbackDatas1);
                                }

                                var result = WMSHelper.isCompletedOutstockOrder(orderNo);
                                if (result) 
                                {
                                    List<ShipmentsTrayFeedbackData.FeedbackData> feedbackDatas2 = new List<ShipmentsTrayFeedbackData.FeedbackData>();
                                    var feedbackData2 = new ShipmentsTrayFeedbackData.FeedbackData() 
                                    {
                                        organizationId = Settings.orgInfo.organizationId,
                                        warehouseId = Settings.orgInfo.warehouseId,
                                        customerId = Settings.orgInfo.customerId,
                                        orderNo = orderNo,
                                        sku = outStockListChild.S_SKU,
                                        qty = cntrItemRels[0].F_QTY.ToString(),
                                        weighQty = cntrItemRels[0].F_NET_WEIGHT.ToString(),
                                        traceId = cntrCode,
                                        serialNo = cntrItemRels[0].S_SERIAL_NO,
                                        toLocationId = fuller.FULLER_CODE,
                                        completedFlag = "Y"
                                    };
                                    feedbackDatas2.Add(feedbackData2);
                                    if (!WMSDispatch.ShipmentsTrayFeedback(feedbackDatas2))
                                    {
                                        outStockFeedbackDatas.Add(feedbackDatas2);
                                    }
                                }
                                
                            }
                        }
                    }

                    var result = WMSHelper.isCompletedOutstockOrder(orderNo);
                    if (result)
                    {
                        List<ShipmentsTrayFeedbackData.FeedbackData> feedbackDatas2 = new List<ShipmentsTrayFeedbackData.FeedbackData>();
                        var feedbackData2 = new ShipmentsTrayFeedbackData.FeedbackData()
                        {
                            organizationId = Settings.orgInfo.organizationId,
                            warehouseId = Settings.orgInfo.warehouseId,
                            customerId = Settings.orgInfo.customerId,
                            orderNo = orderNo,
                            sku = outStockListChild.S_SKU,
                            completedFlag = "Y"
                        };
                        feedbackDatas2.Add(feedbackData2);
                        if (!WMSDispatch.ShipmentsTrayFeedback(feedbackDatas2))
                        {
                            outStockFeedbackDatas.Add(feedbackDatas2);
                        }
                    }
                }
            }
        }