Merge branch 'master' of http://119.3.29.177:3000/Jjie/DeYiShiBase

ICSSoft.WMS.WebAPI/ICSSoft.Common/NewTransType.cs

@@ -31,7 +31,7 @@ namespace ICSSoft.Common
                                         "生产发料-补料申请单","副产品入库-生产订单","条码打印","锐腾两步调入","锐腾委外发料-委外订单备料表",
                                         "无源头调拨","副产品入库-无源头","副产品入库-委外订单","红字其他入库","采购入库-入库单","委外入库-入库单","销售发货-出库单",
                                         "生产发料-生产订单备料表-自动出库","杂发-自动","产成品入库-产成品入库单-mes","销售发货-红字出库单","销售发货-红字出库单原条码","采购退货-采购订单","委外退货-委外采购订单",
-            "物料调拨-自动","销售发货单-快递单","成品预入库-DRCoffee","采购入库-采购订单-DRCoffee","条码拆分记录查询","条码查询-未入库","条码记录","赋码上架","生产交接"
+            "物料调拨-自动","销售发货单-快递单","成品预入库-DRCoffee","采购入库-采购订单-DRCoffee","条码拆分记录查询","条码查询-未入库","条码记录","赋码上架","生产交接","采购到货-开立到货单"
         };
 
 

ICSSoft.WMS.WebAPI/ICSSoft.Common/TransTypeEnum.cs

@@ -20,6 +20,10 @@ namespace ICSSoft.Common
         [DBValue("2")]
         DeliveryNotice,
 
+        [Description("采购到货-开立到货单")]
+        [DBValue("2-1")]
+        DeliveryNoticeOpen,
+
         [Description("采购拒收")]
         [DBValue("42")]
         PurchaseRejectDoc,

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

@@ -2028,7 +2028,28 @@ a.ExtensionID
                         completeWhere = @" a.ReturnCode='{0}' AND a.WorkPoint='{1}' AND a.Status<>'3' AND  a.Quantity>ISNULL(a.ReturnQuantity,0)";
                     }
                     #endregion
+                    #endregion
+                    #region 其他
+                    #region 开立到货单
+                    else if (TransType == TransTypeEnum.DeliveryNoticeOpen.GetDescription())
+                    {
+                        columns = @"a.DNCode AS TransCode,
+                                    a.DNDetailID AS DetailID,
+                                    a.DNType AS Type,
+                                    a.Sequence AS TransSequence,
+                                    isnull(a.Quantity,0) - isnull(a.RCVQuantity,0) AS IssueQuantity,
+                                    a.Quantity,
+                                    a.Amount,
+                                    a.MUSER AS [User],
+                                    a.MTIME AS [MTime],";
+
+                        tableName = @"ICSDeliveryNotice a ";
 
+                        where = @" a.DNCode='{0}' AND a.WorkPoint='{1}' AND a.DNType='1' AND a.Status<>'1'";
+
+                        singleWhere = @" a.DNCode='{0}' AND a.WorkPoint='{1}'";
+                    }
+                    #endregion
                     #endregion
                     if (string.IsNullOrWhiteSpace(columns) || string.IsNullOrWhiteSpace(tableName) || string.IsNullOrWhiteSpace(where))
                         throw new Exception(language.GetNameByCode("WMSAPIInfo003"));
@@ -32636,7 +32657,7 @@ END as NEWLotNo
                                     FROM ICSInventoryLot a
                                     INNER JOIN ICSInventory b ON a.InvCode = b.InvCode
                                     INNER JOIN ICSWareHouseLotInfo c ON c.LotNo = a.LotNo
-                                    INNER JOIN ICSWareHouseLotInfoLog d ON d.LotNo=a.LotNo
+                                    INNER JOIN ICSWareHouseLotInfoLog d ON d.LotNo=a.LotNo AND (businesscode='6' or businesscode='14' or businesscode='32')
                                     LEFT JOIN ICSVendor v ON v.VenCode = a.EATTRIBUTE8
                                     WHERE 
                                         a.lotno LIKE '{0}%' --LEFT('{0}' + '-', CHARINDEX('-', '{0}' + '-') - 1) + '%'

ICSSoft.WMS.WebAPI/ICSSoft.WMS.WebAPI/Controllers/WMSBarCoreController.cs

@@ -6670,7 +6670,7 @@ namespace ICSSoft.WebAPI.Controllers
         [Route("api/BarCodeMsgForSplitDYS/Get")]
         public HttpResponseMessage BarCodeMsgForSplitDYSGet([FromBody] object JsonData)
         {
-            log.Info("获取条码信息传入值" + JsonData);
+            log.Info("条码拆分记录查询传入值：" + Environment.NewLine + JsonData);
             try
             {
                 if (JsonData != null && !string.IsNullOrWhiteSpace(JsonData.ToString()) && JsonData.ToString() != "[]")
@@ -6694,7 +6694,7 @@ namespace ICSSoft.WebAPI.Controllers
                 str = JsonConvert.SerializeObject(res);
                 result.Content = new StringContent(str, Encoding.GetEncoding("UTF-8"), "application/json");
             }
-            log.Debug("获取条码信息返回值：" + str);
+            log.Debug("条码拆分记录查询返回值：" + Environment.NewLine + str);
             return result;
         }