diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go
index 4e458a63f..b75c198be 100644
--- a/business/jxstore/cms/sync2.go
+++ b/business/jxstore/cms/sync2.go
@@ -725,7 +725,7 @@ func FullSyncVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, store
case 0:
_, err = amendAndPruneVendorStuff(ctx, task, storeID, vendorID, vendorOrgCode, false, isContinueWhenError, AmendPruneAll, false)
case 1:
- _, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false)
+ //_, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false)
case 2:
_, err = SyncSkus(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false)
}
diff --git a/business/partner/printer/feie/feie.go b/business/partner/printer/feie/feie.go
index 299c05352..80c10ec6f 100644
--- a/business/partner/printer/feie/feie.go
+++ b/business/partner/printer/feie/feie.go
@@ -112,7 +112,7 @@ func (c *PrinterHandler) getOrderContent(order *model.GoodsOrder, storeTel strin
orderFmt += `%8s%10s%10s
`
orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
case model.EarningTypeQuote: // 报价
- orderFmt += `%s %25s
`
+ orderFmt += `%s %2s
`
orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
}
//标品需要打印条形码
@@ -200,13 +200,14 @@ func (c *PrinterHandler) getOrderContentBig(order *model.GoodsOrder, storeTel st
)
for _, sku := range order.Skus {
- orderFmt += `%s
`
switch order.EarningType {
case model.EarningTypePoints: // 扣点
+ orderFmt += `%s
`
orderFmt += `%s %s %s
`
orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice), jxutils.IntPrice2StandardCurrencyString(sku.VendorPrice*int64(sku.Count)))
case model.EarningTypeQuote: // 报价
- orderFmt += `%s
`
+ orderFmt += `%s %s
`
+ //orderFmt += `%s
`
orderParams = append(orderParams, sku.SkuName, "x"+utils.Int2Str(sku.Count))
}