|
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
|
|
|
import com.uas.ps.core.util.CollectionUtils;
|
|
import com.uas.ps.core.util.CollectionUtils;
|
|
|
import com.uas.ps.entity.Product;
|
|
import com.uas.ps.entity.Product;
|
|
|
import com.uas.ps.entity.Status;
|
|
import com.uas.ps.entity.Status;
|
|
|
|
|
+import com.uas.ps.httplog.annotation.HttpLog;
|
|
|
import com.uas.ps.product.MessageConsumer;
|
|
import com.uas.ps.product.MessageConsumer;
|
|
|
import com.uas.ps.product.entity.Prod;
|
|
import com.uas.ps.product.entity.Prod;
|
|
|
import com.uas.ps.product.entity.ProductSaler;
|
|
import com.uas.ps.product.entity.ProductSaler;
|
|
@@ -49,6 +50,7 @@ public class ProductController {
|
|
|
* @return
|
|
* @return
|
|
|
* @throws UnsupportedEncodingException
|
|
* @throws UnsupportedEncodingException
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/erp/save", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/erp/save", method = RequestMethod.POST)
|
|
|
public void saveProducts(@RequestParam("data") String data, Long enUU) throws UnsupportedEncodingException {
|
|
public void saveProducts(@RequestParam("data") String data, Long enUU) throws UnsupportedEncodingException {
|
|
|
String jsonStr = URLDecoder.decode(data, "UTF-8");
|
|
String jsonStr = URLDecoder.decode(data, "UTF-8");
|
|
@@ -65,6 +67,7 @@ public class ProductController {
|
|
|
* @return
|
|
* @return
|
|
|
* @throws UnsupportedEncodingException
|
|
* @throws UnsupportedEncodingException
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/erp/update", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/erp/update", method = RequestMethod.POST)
|
|
|
public void updateProduct(@RequestParam("data") String data, @RequestParam("enUU") Long enUU) throws UnsupportedEncodingException {
|
|
public void updateProduct(@RequestParam("data") String data, @RequestParam("enUU") Long enUU) throws UnsupportedEncodingException {
|
|
|
String jsonStr = URLDecoder.decode(data, "UTF-8");
|
|
String jsonStr = URLDecoder.decode(data, "UTF-8");
|
|
@@ -80,6 +83,7 @@ public class ProductController {
|
|
|
* @return
|
|
* @return
|
|
|
* @throws UnsupportedEncodingException
|
|
* @throws UnsupportedEncodingException
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/cycleupdate", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/cycleupdate", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public void updateProducts(@RequestParam("data") String data, Long enUU) throws UnsupportedEncodingException {
|
|
public void updateProducts(@RequestParam("data") String data, Long enUU) throws UnsupportedEncodingException {
|
|
@@ -95,6 +99,7 @@ public class ProductController {
|
|
|
* @param data 物料信息
|
|
* @param data 物料信息
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/update", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public List<Long> updateProdInfo(@RequestBody String data) throws UnsupportedEncodingException {
|
|
public List<Long> updateProdInfo(@RequestBody String data) throws UnsupportedEncodingException {
|
|
@@ -121,6 +126,7 @@ public class ProductController {
|
|
|
* @param data 物料信息
|
|
* @param data 物料信息
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/update/b2b", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/update/b2b", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public List<Long> updateB2bProdInfo(@RequestBody List<Product> data) throws UnsupportedEncodingException {
|
|
public List<Long> updateB2bProdInfo(@RequestBody List<Product> data) throws UnsupportedEncodingException {
|
|
@@ -156,6 +162,7 @@ public class ProductController {
|
|
|
* @param json
|
|
* @param json
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/match/nonProduct", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/match/nonProduct", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public ModelMap matchB2cAll(@RequestBody String json) {
|
|
public ModelMap matchB2cAll(@RequestBody String json) {
|
|
@@ -170,6 +177,7 @@ public class ProductController {
|
|
|
* @param idList
|
|
* @param idList
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/match/selected", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/match/selected", method = RequestMethod.POST)
|
|
|
public ModelMap matchSelected(@RequestParam Long enUU, @RequestBody List<Long> idList) {
|
|
public ModelMap matchSelected(@RequestParam Long enUU, @RequestBody List<Long> idList) {
|
|
|
return productService.batchMatch(enUU, idList);
|
|
return productService.batchMatch(enUU, idList);
|
|
@@ -182,6 +190,7 @@ public class ProductController {
|
|
|
* @param productId
|
|
* @param productId
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping("/assign")
|
|
@RequestMapping("/assign")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public ModelMap assignPersonalProduct(@RequestParam Long userUU, @RequestParam Long productId) {
|
|
public ModelMap assignPersonalProduct(@RequestParam Long userUU, @RequestParam Long productId) {
|
|
@@ -195,6 +204,7 @@ public class ProductController {
|
|
|
* @param productId
|
|
* @param productId
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/assign/batch", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/assign/batch", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public String assignPersonalProductByBatch(@RequestParam Long userUU, @RequestBody String productId) throws UnsupportedEncodingException {
|
|
public String assignPersonalProductByBatch(@RequestParam Long userUU, @RequestBody String productId) throws UnsupportedEncodingException {
|
|
@@ -212,6 +222,7 @@ public class ProductController {
|
|
|
* @param productId
|
|
* @param productId
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping("/assign/delete")
|
|
@RequestMapping("/assign/delete")
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public ModelMap assignPersonalProductDelete(@RequestParam Long userUU, @RequestParam Long productId) {
|
|
public ModelMap assignPersonalProductDelete(@RequestParam Long userUU, @RequestParam Long productId) {
|
|
@@ -223,6 +234,7 @@ public class ProductController {
|
|
|
*
|
|
*
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/backtouas", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/backtouas", method = RequestMethod.GET)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public List<Prod> getProds(Long enUU) {
|
|
public List<Prod> getProds(Long enUU) {
|
|
@@ -246,6 +258,7 @@ public class ProductController {
|
|
|
* @param data 下载成功的物料id
|
|
* @param data 下载成功的物料id
|
|
|
* @throws UnsupportedEncodingException
|
|
* @throws UnsupportedEncodingException
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/refreshDownloadStatus", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/refreshDownloadStatus", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public void refreshDownloadStatus(@RequestParam("data") String data) throws UnsupportedEncodingException {
|
|
public void refreshDownloadStatus(@RequestParam("data") String data) throws UnsupportedEncodingException {
|
|
@@ -260,6 +273,7 @@ public class ProductController {
|
|
|
* @param data 同步的个人物料信息
|
|
* @param data 同步的个人物料信息
|
|
|
* @throws UnsupportedEncodingException
|
|
* @throws UnsupportedEncodingException
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/produser", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/produser", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public void updateProdSaler(@RequestParam("data") String data) throws UnsupportedEncodingException {
|
|
public void updateProdSaler(@RequestParam("data") String data) throws UnsupportedEncodingException {
|
|
@@ -277,6 +291,7 @@ public class ProductController {
|
|
|
* @param data 删除的个人物料信息
|
|
* @param data 删除的个人物料信息
|
|
|
* @throws UnsupportedEncodingException 解析异常
|
|
* @throws UnsupportedEncodingException 解析异常
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/produser/quit", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/produser/quit", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public void uploadProductSalerForCancel(@RequestParam("data") String data) throws UnsupportedEncodingException {
|
|
public void uploadProductSalerForCancel(@RequestParam("data") String data) throws UnsupportedEncodingException {
|
|
@@ -293,6 +308,7 @@ public class ProductController {
|
|
|
* @since 2018-01-23 19:23
|
|
* @since 2018-01-23 19:23
|
|
|
* @param id 物料id
|
|
* @param id 物料id
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/matchResultAndProductUser/delete", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/matchResultAndProductUser/delete", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public void deleteMatchResultAndProductUser(@RequestParam("id") Long id) {
|
|
public void deleteMatchResultAndProductUser(@RequestParam("id") Long id) {
|
|
@@ -307,6 +323,7 @@ public class ProductController {
|
|
|
* @param switchType 开关类型(销售/采购) sale or purc
|
|
* @param switchType 开关类型(销售/采购) sale or purc
|
|
|
* @param switchStatus 开关状态 1 或 0
|
|
* @param switchStatus 开关状态 1 或 0
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/saleAndPurchase/edit/toggle", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/saleAndPurchase/edit/toggle", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public void switchProductByEnUU(@RequestParam("enUU") Long enUU,
|
|
public void switchProductByEnUU(@RequestParam("enUU") Long enUU,
|
|
@@ -327,6 +344,7 @@ public class ProductController {
|
|
|
* @param switchType 开关类型(销售/采购) sale or purc
|
|
* @param switchType 开关类型(销售/采购) sale or purc
|
|
|
* @param switchStatus 开关状态 1 或 0
|
|
* @param switchStatus 开关状态 1 或 0
|
|
|
*/
|
|
*/
|
|
|
|
|
+ @HttpLog
|
|
|
@RequestMapping(value = "/edit/toggle/one", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/edit/toggle/one", method = RequestMethod.POST)
|
|
|
@ResponseBody
|
|
@ResponseBody
|
|
|
public void switchProductById(@RequestParam("id") Long id,
|
|
public void switchProductById(@RequestParam("id") Long id,
|